fixed fl makefiles that Julian didn't fix correctly

[wxWidgets.git] / src / makeprog.env.in

diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index e529f590f172e73ac11a197cd7a9280328770565..3e33e6a51dd2bb96a7b67a2f95abe747959118de 100644 (file)
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -3,40 +3,53 @@
 # Clears all default suffixes
 .SUFFIXES:     .o .cpp .c .cxx
 
 # Clears all default suffixes
 .SUFFIXES:     .o .cpp .c .cxx
 

-# The binary program extension, if any, including dots (e.g. '.exe')
+# The binary program extension, if any, including dots {e.g. '.exe'}

 PROGRAM_EXT = @PROGRAM_EXT@
 PROGRAM_EXT = @PROGRAM_EXT@

-BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT)
+BIN_PROGRAM = ${PROGRAM}${PROGRAM_EXT}
+RES_PROGRAM = ${PROGRAM}_resources.o
+RES_PROGRAM_OPT = @RESPROGRAM@
+
+# To add resources to the Mac OS X applications
+LIBWX_MACRES = ${top_builddir}/lib/lib@WX_LIBRARY@-${WX_MAJOR_VERSION_NUMBER}.${WX_MINOR_VERSION_NUMBER}.r
+LIBWX_MACRESCOMP = ${RESCOMP} ${RESFLAGS} ${LIBWX_MACRES} -o ${BIN_PROGRAM}

 
 .c.o :
 
 .c.o :

-       $(CCC) -c $(CFLAGS) -o $@ $<
+       ${CCC} -c @DEP_INFO_FLAGS@ ${CFLAGS} ${APPEXTRADEFS} -o $@ $<

 
 .cpp.o :
 
 .cpp.o :

-       $(CC) -c $(CPPFLAGS) -o $@ $<
+       ${CC} -c @DEP_INFO_FLAGS@ ${CXXFLAGS} ${APPEXTRADEFS} -o $@ $<

 
 .cxx.o :
 
 .cxx.o :

-       $(CC) -c $(CPPFLAGS) -o $@ $<
+       ${CC} -c @DEP_INFO_FLAGS@ ${CXXFLAGS} ${APPEXTRADEFS} -o $@ $<

 
 

-VPATH = :$(top_srcdir)/$(program_dir)
+# the comment at the end of the next line is needed because otherwise autoconf
+# would remove this line completely - it contains a built-in hack to remove
+# any VPATH assignment not containing ':'
+VPATH = @PATH_IFS@${top_srcdir}/${program_dir} # ':' for autoconf

 
 # Set defaults from configure
 
 # Set defaults from configure

-include $(top_builddir)/src/make.env
+include ${top_builddir}/src/make.env
+
+all:    ${BIN_PROGRAM} install_dirs install_data

 
 

-all:    $(BIN_PROGRAM) install_dirs install_data
+${BIN_PROGRAM}:        ${OBJECTS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${RES_PROGRAM_OPT} @LIBWXMACRES@
+       ${CC} ${LDFLAGS} -o ${BIN_PROGRAM} ${OBJECTS} ${LDLIBS} ${LIBRARIES} ${RES_PROGRAM_OPT}
+       @LIBWXMACRESCOMP@

 
 

-$(BIN_PROGRAM):        $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@
-       $(CC) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS)
+${RES_PROGRAM}:  ${PROGRAM}.rc
+       ${RESCOMP} ${RCINPUTSWITCH} ${top_srcdir}/${program_dir}/${PROGRAM}.rc ${RCOUTPUTSWITCH} ${PROGRAM}_resources.o ${RESFLAGS}

 
 install_dirs:
 
 install_dirs:

-       @list='$(DATADIRS)'; for p in $$list; do \
-         mkdir -p $(top_builddir)/$(program_dir)/$$p; \
+       @list='${DATADIRS}'; for p in $$list; do \
+         mkdir -p ${top_builddir}/${program_dir}/$$p; \

        done
        
 install_data:
        done
        
 install_data:

-       @list='$(DATAFILES)'; for p in $$list; do \
-         if test ! -s $(top_builddir)/$(program_dir)/$$p; then \
-            cp -pRf $(top_srcdir)/$(program_dir)/$$p $(top_builddir)/$(program_dir)/$$p; \
+       @list='${DATAFILES}'; for p in $$list; do \
+         if test ! -s ${top_builddir}/${program_dir}/$$p; then \
+            cp -pRf ${top_srcdir}/${program_dir}/$$p ${top_builddir}/${program_dir}/$$p; \

          fi; \
        done
 
 clean:
          fi; \
        done
 
 clean:

-       rm -f $(OBJECTS) $(BIN_PROGRAM) core
+       rm -f ${OBJECTS} ${BIN_PROGRAM}  ${RES_PROGRAM} core