fixed bundles dependency

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-08-23 21:51:13 +00:00
parent e24124667e
commit 54eba47d04
2 changed files with 6 additions and 5 deletions

View File

@ -29,9 +29,10 @@
<!-- bundle directory: --> <!-- bundle directory: -->
<set var="BUNDLE">$(id).app/Contents</set> <set var="BUNDLE">$(id).app/Contents</set>
<set var="BUNDLE_TGT">$(BUNDLE)/PkgInfo</set>
<add-target target="$(BUNDLE)" type="action"/> <add-target target="$(BUNDLE_TGT)" type="action"/>
<modify-target target="$(BUNDLE)"> <modify-target target="$(BUNDLE_TGT)">
<!-- required data: --> <!-- required data: -->
<depends>$(id)</depends> <depends>$(id)</depends>
<depends-on-file>$(BUNDLE_PLIST)</depends-on-file> <depends-on-file>$(BUNDLE_PLIST)</depends-on-file>
@ -67,7 +68,7 @@
cond="PLATFORM_MACOSX=='1'"/> cond="PLATFORM_MACOSX=='1'"/>
<modify-target target="$(id)_bundle"> <modify-target target="$(id)_bundle">
<dependency-of>all</dependency-of> <dependency-of>all</dependency-of>
<depends>$(BUNDLE)</depends> <depends>$(BUNDLE_TGT)</depends>
</modify-target> </modify-target>
<!-- "make clean" should delete the bundle: --> <!-- "make clean" should delete the bundle: -->

View File

@ -118,7 +118,7 @@ minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc)
$(__minimal___mac_setfilecmd) $(__minimal___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK) $(SAMPLES_RPATH_POSTLINK)
minimal.app/Contents: minimal$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
mkdir -p minimal.app/Contents mkdir -p minimal.app/Contents
mkdir -p minimal.app/Contents/MacOS mkdir -p minimal.app/Contents/MacOS
mkdir -p minimal.app/Contents/Resources mkdir -p minimal.app/Contents/Resources
@ -139,7 +139,7 @@ minimal.app/Contents: minimal$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc minimal.app/Contents/Resources/minimal.rsrc ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc minimal.app/Contents/Resources/minimal.rsrc
ln -f $(top_srcdir)/src/mac/wxmac.icns minimal.app/Contents/Resources/wxmac.icns ln -f $(top_srcdir)/src/mac/wxmac.icns minimal.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@minimal_bundle: minimal.app/Contents @COND_PLATFORM_MACOSX_1@minimal_bundle: minimal.app/Contents/PkgInfo
minimal_minimal.o: $(srcdir)/minimal.cpp minimal_minimal.o: $(srcdir)/minimal.cpp
$(CXXC) -c -o $@ $(MINIMAL_CXXFLAGS) $< $(CXXC) -c -o $@ $(MINIMAL_CXXFLAGS) $<