Changeset 98b97c6 in git


Ignore:
Timestamp:
24/02/15 19:27:09 (5 years ago)
Author:
Olly Betts <olly@…>
Branches:
line_contents, master, stereo, travis-osx
Children:
005adaf
Parents:
5644c79
Message:

src/Makefile.am: Fix include path to .ico files.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r5644c79 r98b97c6  
     1Tue Feb 24 19:26:48 GMT 2015  Olly Betts <olly@survex.com>
     2
     3        * src/Makefile.am: Fix include path to .ico files.
     4
    15Tue Feb 24 19:04:01 GMT 2015  Olly Betts <olly@survex.com>
    26
  • src/Makefile.am

    r5644c79 r98b97c6  
    6464aven_LDADD = avenrc.o $(LIBOBJS) $(AVEN_LIBS) $(WX_LIBS) $(PROJ_LIBS)
    6565
    66 svxeditrc.o: $(srcdir)/svxedit.rc svxedit.ico
    67         pwd=`pwd` && cd $(srcdir) && `$(WX_CONFIG) --rescomp` -o "$$pwd/svxeditrc.o" svxedit.rc
    68 
    69 svxedit.ico: ../lib/icons/svxedit.ico
    70         cp ../lib/icons/svxedit.ico .
     66svxeditrc.o: $(srcdir)/svxedit.rc ../lib/icons/svxedit.ico
     67        pwd=`pwd` && cd $(srcdir) && `$(WX_CONFIG) --rescomp` --include-dir "$$pwd/../lib/icons" -o "$$pwd/svxeditrc.o" svxedit.rc
    7168
    7269editwrap_LDADD = svxeditrc.o
    7370
    74 avenrc.o: $(srcdir)/aven.rc aven.ico
    75         pwd=`pwd` && cd $(srcdir) && `$(WX_CONFIG) --rescomp` -o "$$pwd/avenrc.o" aven.rc
     71avenrc.o: $(srcdir)/aven.rc ../lib/icons/aven.ico
     72        pwd=`pwd` && cd $(srcdir) && `$(WX_CONFIG) --rescomp` --include-dir "$$pwd/../lib/icons" -o "$$pwd/avenrc.o" aven.rc
    7673
    77 aven.ico: ../lib/icons/aven.ico
    78         cp ../lib/icons/aven.ico .
    79 
    80 CLEANFILES = aven.ico svxedit.ico
    8174else
    8275aven_LDADD = $(LIBOBJS) $(AVEN_LIBS) $(WX_LIBS) $(PROJ_LIBS)
Note: See TracChangeset for help on using the changeset viewer.