don't use deprecated toolbar API

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

diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in
index 12378e12ef8edeabf524b977529d64c47349f33b..15589b1e1bd33422c73bb94f8580b6d79234452e 100644 (file)
--- a/samples/menu/Makefile.in
+++ b/samples/menu/Makefile.in
@@ -96,9 +96,13 @@ COND_PLATFORM_OS2_1___menu___os2_emxbindcmd = $(NM) menu$(EXEEXT) | if grep -q \
 @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__menu_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__menu_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@       = menu.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__menu_bundle___depname = menu_bundle
-@COND_TOOLKIT_COCOA@____menu_BUNDLE_TGT_REF_DEP = menu.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____menu_BUNDLE_TGT_REF_DEP = menu.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@____menu_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   $(__menu_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_MAC@____menu_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     $(__menu_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -158,25 +162,25 @@ menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc)
        $(__menu___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-       mkdir -p menu.app/Contents
-       mkdir -p menu.app/Contents/MacOS
-       mkdir -p menu.app/Contents/Resources
-       
-       
-       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-       -e "s/EXECUTABLE/menu/" \
-       -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/carbon/Info.plist.in >menu.app/Contents/Info.plist
-       
-       
-       echo -n "APPL????" >menu.app/Contents/PkgInfo
-       
-       
-       ln -f menu$(EXEEXT) menu.app/Contents/MacOS/menu
-       
-       
-       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns menu.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       mkdir -p menu.app/Contents
+@COND_PLATFORM_MACOSX_1@       mkdir -p menu.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@       mkdir -p menu.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/menu/" \
+@COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >menu.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >menu.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       ln -f menu$(EXEEXT) menu.app/Contents/MacOS/menu
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns menu.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@menu_bundle: $(____menu_BUNDLE_TGT_REF_DEP)