X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef7f21894c8542838e17c8b441ff8d748fd675cd..f7292ebebae552238c50f8009db572edc44a315e:/src/makeprog.env.in

diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index 249a825875..f8f61f00cb 100644
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -6,16 +6,19 @@ BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT)
 RES_PROGRAM_OBJ = @RESPROGRAMOBJ@
 BUNDLE = $(BIN_PROGRAM).app/Contents
 
-%.o : %.c
+# NB: see remark in Makefile.in as to why we don't use %.foo: %.bar rules
+.SUFFIXES: .o .c .cpp .cxx .rc _resources.o
+
+.c.o:
 	$(CC) -c $(CFLAGS) $(APPEXTRADEFS) -o $@ $<
 
-%.o : %.cpp
+.cpp.o:
 	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
 
-%.o : %.cxx
+.cxx.o:
 	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
 
-%_resources.o : %.rc
+.rc_resources.o:
 	$(RESCOMP) -i $< -o $@ $(RESFLAGS)
 
 
@@ -30,8 +33,9 @@ include $(top_builddir)/src/make.env
 all:    $(BIN_PROGRAM) @MACOSX_BUNDLE@ install_dirs install_data
 
 $(BIN_PROGRAM):	$(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(RES_PROGRAM_OBJ) @LIBWXMACRES@
-	$(CXX) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OBJ)
-	@LIBWXMACRESCOMP@
+	$(CXX) $(LDFLAGS_EXE) -o $@ $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OBJ)
+	@MACRESCOMP@ $(BIN_PROGRAM) $(RESOPTIONS)
+	@MACSETFILE@ $(SETOPTIONS) $(BIN_PROGRAM)
 
 install_dirs:
 	@list='$(DATADIRS)'; for p in $$list; do \
@@ -51,11 +55,11 @@ clean:
 #
 # Targets to build a Mac OS X application bundle
 #
-bundle: $(BUNDLE)/Info.plist $(BUNDLE)/PkgInfo $(BUNDLE)/MacOS/$(PROGRAM) $(BUNDLE)/Resources/$(PROGRAM).rsrc $(BUNDLE)/Resources/$(PROGRAM).icns
+bundle: $(BUNDLE)/MacOS/$(PROGRAM) $(BUNDLE)/Info.plist $(BUNDLE)/PkgInfo $(BUNDLE)/Resources/$(PROGRAM).rsrc $(BUNDLE)/Resources/wxmac.icns
 
-$(BUNDLE)/Info.plist: $(top_srcdir)/src/$(TOOLKITDIR)/Info.plist.in $(BIN_PROGRA)
+$(BUNDLE)/Info.plist: $(top_srcdir)/src/$(TOOLKITDIR)/Info.plist.in $(top_builddir)/lib/@WX_TARGET_LIBRARY@
 	@$(INSTALL) -d `dirname $@`
-	sed -e "s/IDENTIFIER/`echo $(program_dir) | sed 's,/,.,'`/" \
+	sed -e "s/IDENTIFIER/`echo $(program_dir) | sed 's,/,.,g'`/" \
 	    -e "s/EXECUTABLE/$(PROGRAM)/" \
 	    -e "s/VERSION/$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)/" $< > $@
 
@@ -63,14 +67,14 @@ $(BUNDLE)/PkgInfo:
 	@$(INSTALL) -d `dirname $@`
 	echo -n "APPL????" > $@
 
-$(BUNDLE)/MacOS/$(PROGRAM): $(BIN_PROGRAM)
+$(BUNDLE)/MacOS/$(PROGRAM): $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@
 	@$(INSTALL) -d `dirname $@`
-	cp $< $@
+	$(CXX) $(LDFLAGS_EXE) -o $@ $(OBJECTS) $(LDLIBS) $(LIBRARIES)
 
-$(BUNDLE)/Resources/$(PROGRAM).rsrc: $(top_builddir)/lib/@WX_RESOURCES_MACOSX@
+$(BUNDLE)/Resources/$(PROGRAM).rsrc: $(top_builddir)/lib/@WX_RESOURCES_MACOSX_DATA@
 	@$(INSTALL) -d `dirname $@`
 	cp $< $@
 
-$(BUNDLE)/Resources/$(PROGRAM).icns: $(top_srcdir)/src/$(TOOLKITDIR)/wxmac.icns
+$(BUNDLE)/Resources/wxmac.icns: $(top_srcdir)/src/$(TOOLKITDIR)/wxmac.icns
 	@$(INSTALL) -d `dirname $@`
 	cp $< $@