Update files.bkl to match the changes Stefan made to Makefile.in earlier, to update...

[wxWidgets.git] / demos / forty / Makefile.in

diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in
index ec3b809db18c3abd83894e46ede5f8ba8c5d8499..dac3e230796a3340998aff2ce9356c92b3656d75 100644 (file)
--- a/demos/forty/Makefile.in
+++ b/demos/forty/Makefile.in
@@ -107,10 +107,13 @@ COND_PLATFORM_OS2_1___forty___os2_emxbindcmd = $(NM) forty$(EXEEXT) | if grep -q
 @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__forty_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__forty_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@       = forty.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__forty_bundle___depname = forty_bundle
 @COND_TOOLKIT_COCOA@____forty_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@   forty.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____forty_BUNDLE_TGT_REF_DEP = forty.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@   $(__forty_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_MAC@____forty_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     $(__forty_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_HTML_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
@@ -179,25 +182,25 @@ forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc)
        $(__forty___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-forty.app/Contents/PkgInfo: forty$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-       mkdir -p forty.app/Contents
-       mkdir -p forty.app/Contents/MacOS
-       mkdir -p forty.app/Contents/Resources
-       
-       
-       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-       -e "s/EXECUTABLE/forty/" \
-       -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/carbon/Info.plist.in >forty.app/Contents/Info.plist
-       
-       
-       echo -n "APPL????" >forty.app/Contents/PkgInfo
-       
-       
-       ln -f forty$(EXEEXT) forty.app/Contents/MacOS/forty
-       
-       
-       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns forty.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@forty.app/Contents/PkgInfo: forty$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       mkdir -p forty.app/Contents
+@COND_PLATFORM_MACOSX_1@       mkdir -p forty.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@       mkdir -p forty.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/forty/" \
+@COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >forty.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >forty.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       ln -f forty$(EXEEXT) forty.app/Contents/MacOS/forty
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns forty.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@forty_bundle: $(____forty_BUNDLE_TGT_REF_DEP)