don't use deprecated toolbar API

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

diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in
index 2f0b6c5f554a4fec7be3d46acdda64d53eecf470..30c5b00527612ccf70eaf26132144ef6d90dbb9d 100644 (file)
--- a/samples/thread/Makefile.in
+++ b/samples/thread/Makefile.in
@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___thread___os2_emxbindcmd = $(NM) thread$(EXEEXT) | if grep
 @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__thread_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__thread_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res

+@COND_PLATFORM_MACOSX_1@__thread_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@       = thread.app/Contents/PkgInfo

 @COND_PLATFORM_MACOSX_1@__thread_bundle___depname = thread_bundle
 @COND_TOOLKIT_COCOA@____thread_BUNDLE_TGT_REF_DEP = \
 @COND_PLATFORM_MACOSX_1@__thread_bundle___depname = thread_bundle
 @COND_TOOLKIT_COCOA@____thread_BUNDLE_TGT_REF_DEP = \

-@COND_TOOLKIT_COCOA@   thread.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@   $(__thread_app_Contents_PkgInfo___depname)

 @COND_TOOLKIT_MAC@____thread_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_MAC@____thread_BUNDLE_TGT_REF_DEP = \

-@COND_TOOLKIT_MAC@     thread.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@     $(__thread_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)
 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)


@@ -160,25 +162,25 @@ thread$(EXEEXT): $(THREAD_OBJECTS) $(__thread___win32rc)
        $(__thread___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__thread___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-thread.app/Contents/PkgInfo: thread$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-       mkdir -p thread.app/Contents
-       mkdir -p thread.app/Contents/MacOS
-       mkdir -p thread.app/Contents/Resources
-       
-       
-       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-       -e "s/EXECUTABLE/thread/" \
-       -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/carbon/Info.plist.in >thread.app/Contents/Info.plist
-       
-       
-       echo -n "APPL????" >thread.app/Contents/PkgInfo
-       
-       
-       ln -f thread$(EXEEXT) thread.app/Contents/MacOS/thread
-       
-       
-       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns thread.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@thread.app/Contents/PkgInfo: thread$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       mkdir -p thread.app/Contents
+@COND_PLATFORM_MACOSX_1@       mkdir -p thread.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@       mkdir -p thread.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/thread/" \
+@COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >thread.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >thread.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       ln -f thread$(EXEEXT) thread.app/Contents/MacOS/thread
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns thread.app/Contents/Resources/wxmac.icns

 
 @COND_PLATFORM_MACOSX_1@thread_bundle: $(____thread_BUNDLE_TGT_REF_DEP)
 
 
 @COND_PLATFORM_MACOSX_1@thread_bundle: $(____thread_BUNDLE_TGT_REF_DEP)