corrected application bundle building for Mac OS X

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index 1b2d8aebd5f5c1cb1f7efda407bbe548de0ff9b8..9dc501ed51f771e171c8e4b10f677a6d529d1e17 100644 (file)
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -30,7 +30,7 @@ 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_EXE) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OBJ)
+       $(CXX) $(LDFLAGS_EXE) -o $@ $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OBJ)
        @LIBWXMACRESCOMP@
 
 install_dirs:
@@ -51,9 +51,9 @@ 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/$(PROGRAM).icns
 
-$(BUNDLE)/Info.plist: $(top_srcdir)/src/$(TOOLKITDIR)/Info.plist.in $(BIN_PROGRAM)
+$(BUNDLE)/Info.plist: $(top_srcdir)/src/$(TOOLKITDIR)/Info.plist.in $(BUNDLE)/MacOS/$(PROGRAM)
        @$(INSTALL) -d `dirname $@`
        sed -e "s/IDENTIFIER/`echo $(program_dir) | sed 's,/,.,g'`/" \
            -e "s/EXECUTABLE/$(PROGRAM)/" \
@@ -63,13 +63,13 @@ $(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@
-       @$(INSTALL) -d `dirname $@`
-       cp $< $@
+$(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
        @$(INSTALL) -d `dirname $@`