added wxGenericStaticBitmap (#9608)

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

diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in
index a617e30c9f5170e720af36dfedbcd6756d222109..c5ee279ccb82ec606a24d5a49dcd8290f5e9e8e0 100644 (file)
--- a/samples/combo/Makefile.in
+++ b/samples/combo/Makefile.in
@@ -99,10 +99,13 @@ COND_PLATFORM_OS2_1___combo___os2_emxbindcmd = $(NM) combo$(EXEEXT) | if grep -q
 @COND_PLATFORM_WIN32_1@__combo___win32rc = combo_sample_rc.o
 @COND_PLATFORM_OS2_1@__combo_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__combo_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@       = combo.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__combo_bundle___depname = combo_bundle
 @COND_TOOLKIT_COCOA@____combo_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@   combo.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____combo_BUNDLE_TGT_REF_DEP = combo.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@   $(__combo_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_MAC@____combo_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     $(__combo_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)
@@ -164,25 +167,25 @@ combo$(EXEEXT): $(COMBO_OBJECTS) $(__combo___win32rc)
        $(__combo___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-combo.app/Contents/PkgInfo: combo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-       mkdir -p combo.app/Contents
-       mkdir -p combo.app/Contents/MacOS
-       mkdir -p combo.app/Contents/Resources
-       
-       
-       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-       -e "s/EXECUTABLE/combo/" \
-       -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/carbon/Info.plist.in >combo.app/Contents/Info.plist
-       
-       
-       echo -n "APPL????" >combo.app/Contents/PkgInfo
-       
-       
-       ln -f combo$(EXEEXT) combo.app/Contents/MacOS/combo
-       
-       
-       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns combo.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@combo.app/Contents/PkgInfo: combo$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       mkdir -p combo.app/Contents
+@COND_PLATFORM_MACOSX_1@       mkdir -p combo.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@       mkdir -p combo.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/combo/" \
+@COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >combo.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >combo.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       ln -f combo$(EXEEXT) combo.app/Contents/MacOS/combo
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns combo.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@combo_bundle: $(____combo_BUNDLE_TGT_REF_DEP)