OSX reshuffling

[wxWidgets.git] / samples / editlbox / Makefile.in

diff --git a/samples/editlbox/Makefile.in b/samples/editlbox/Makefile.in
index 4ae0cf15d159e42c96ad516ed33c2866fc9e0656..2c0e800b0d64dfeae145a51c23de0788f4dc1757 100644 (file)
--- a/samples/editlbox/Makefile.in
+++ b/samples/editlbox/Makefile.in
@@ -99,11 +99,13 @@ COND_PLATFORM_OS2_1___editlbox___os2_emxbindcmd = $(NM) editlbox$(EXEEXT) | if \
 @COND_PLATFORM_WIN32_1@__editlbox___win32rc = editlbox_sample_rc.o
 @COND_PLATFORM_OS2_1@__editlbox_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__editlbox_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@       = editlbox.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__editlbox_bundle___depname = editlbox_bundle
 @COND_TOOLKIT_COCOA@____editlbox_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@   editlbox.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@   $(__editlbox_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____editlbox_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     editlbox.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@     $(__editlbox_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -165,25 +167,25 @@ editlbox$(EXEEXT): $(EDITLBOX_OBJECTS) $(__editlbox___win32rc)
        $(__editlbox___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-editlbox.app/Contents/PkgInfo: editlbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-       mkdir -p editlbox.app/Contents
-       mkdir -p editlbox.app/Contents/MacOS
-       mkdir -p editlbox.app/Contents/Resources
-       
-       
-       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-       -e "s/EXECUTABLE/editlbox/" \
-       -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/carbon/Info.plist.in >editlbox.app/Contents/Info.plist
-       
-       
-       echo -n "APPL????" >editlbox.app/Contents/PkgInfo
-       
-       
-       ln -f editlbox$(EXEEXT) editlbox.app/Contents/MacOS/editlbox
-       
-       
-       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns editlbox.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@editlbox.app/Contents/PkgInfo: editlbox$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       mkdir -p editlbox.app/Contents
+@COND_PLATFORM_MACOSX_1@       mkdir -p editlbox.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@       mkdir -p editlbox.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/editlbox/" \
+@COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >editlbox.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >editlbox.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       ln -f editlbox$(EXEEXT) editlbox.app/Contents/MacOS/editlbox
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns editlbox.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@editlbox_bundle: $(____editlbox_BUNDLE_TGT_REF_DEP)