X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3283290881daec2a6d81caaa36ecae1064a67051..2d2c394b59407ca3780a92a28ab12f63489c9cb1:/src/makeprog.env.in

diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index 8e64d3f9db..3e33e6a51d 100644
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -3,48 +3,53 @@
 # 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@
-BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT)
-RES_PROGRAM = $(PROGRAM)_resources.o
+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 :
-	$(CCC) -c $(CFLAGS) -o $@ $<
+	${CCC} -c @DEP_INFO_FLAGS@ ${CFLAGS} ${APPEXTRADEFS} -o $@ $<
 
 .cpp.o :
-	$(CC) -c $(CPPFLAGS) -o $@ $<
+	${CC} -c @DEP_INFO_FLAGS@ ${CXXFLAGS} ${APPEXTRADEFS} -o $@ $<
 
 .cxx.o :
-	$(CC) -c $(CPPFLAGS) -o $@ $<
+	${CC} -c @DEP_INFO_FLAGS@ ${CXXFLAGS} ${APPEXTRADEFS} -o $@ $<
 
 # 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
+VPATH = @PATH_IFS@${top_srcdir}/${program_dir} # ':' for autoconf
 
 # 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)
-	$(CC) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OPT)
+${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@
 
-$(RES_PROGRAM):  $(PROGRAM).rc
-	$(RESCOMP) $(RCINPUTSWITCH) $(top_srcdir)/$(program_dir)/$(PROGRAM).rc $(RCOUTPUTSWITCH) $(PROGRAM)_resources.o $(RESFLAGS)
+${RES_PROGRAM}:  ${PROGRAM}.rc
+	${RESCOMP} ${RCINPUTSWITCH} ${top_srcdir}/${program_dir}/${PROGRAM}.rc ${RCOUTPUTSWITCH} ${PROGRAM}_resources.o ${RESFLAGS}
 
 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:
-	@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:
-	rm -f $(OBJECTS) $(BIN_PROGRAM)  $(RES_PROGRAM) core
+	rm -f ${OBJECTS} ${BIN_PROGRAM}  ${RES_PROGRAM} core