don't use deprecated toolbar API

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

diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in
index ebb8b4fd91fa9963cf68d6ea36d72106fc740a38..0741b9144cb39f4bf1595596c442f5f23b71917d 100644 (file)
--- a/samples/mediaplayer/Makefile.in
+++ b/samples/mediaplayer/Makefile.in
@@ -99,11 +99,13 @@ COND_PLATFORM_OS2_1___mediaplayer___os2_emxbindcmd = $(NM) \
 @COND_PLATFORM_WIN32_1@__mediaplayer___win32rc = mediaplayer_sample_rc.o
 @COND_PLATFORM_OS2_1@__mediaplayer_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__mediaplayer_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@       = mediaplayer.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__mediaplayer_bundle___depname = mediaplayer_bundle
 @COND_TOOLKIT_COCOA@____mediaplayer_BUNDLE_TGT_REF_DEP \
-@COND_TOOLKIT_COCOA@   = mediaplayer.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@   = $(__mediaplayer_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____mediaplayer_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     mediaplayer.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@     $(__mediaplayer_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0_USE_MEDIA_1___WXLIB_MEDIA_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0_USE_MEDIA_1@__WXLIB_MEDIA_p = $(COND_MONOLITHIC_0_USE_MEDIA_1___WXLIB_MEDIA_p)
@@ -165,25 +167,25 @@ mediaplayer$(EXEEXT): $(MEDIAPLAYER_OBJECTS) $(__mediaplayer___win32rc)
        $(__mediaplayer___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-mediaplayer.app/Contents/PkgInfo: mediaplayer$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-       mkdir -p mediaplayer.app/Contents
-       mkdir -p mediaplayer.app/Contents/MacOS
-       mkdir -p mediaplayer.app/Contents/Resources
-       
-       
-       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-       -e "s/EXECUTABLE/mediaplayer/" \
-       -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/carbon/Info.plist.in >mediaplayer.app/Contents/Info.plist
-       
-       
-       echo -n "APPL????" >mediaplayer.app/Contents/PkgInfo
-       
-       
-       ln -f mediaplayer$(EXEEXT) mediaplayer.app/Contents/MacOS/mediaplayer
-       
-       
-       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mediaplayer.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@mediaplayer.app/Contents/PkgInfo: mediaplayer$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       mkdir -p mediaplayer.app/Contents
+@COND_PLATFORM_MACOSX_1@       mkdir -p mediaplayer.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@       mkdir -p mediaplayer.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/mediaplayer/" \
+@COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >mediaplayer.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >mediaplayer.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       ln -f mediaplayer$(EXEEXT) mediaplayer.app/Contents/MacOS/mediaplayer
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns mediaplayer.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@mediaplayer_bundle: $(____mediaplayer_BUNDLE_TGT_REF_DEP)