X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b92ca8cf62d6de2891e82ecba13a89754139567f..1a838ff58bfd0fd040156a16ce6fd804e20b5f46:/samples/sound/Makefile.in

diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in
index 26aeb41314..c91e76cbb4 100644
--- a/samples/sound/Makefile.in
+++ b/samples/sound/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.1
+WX_VERSION = 2.5.2
 LIBDIRNAME = $(top_builddir)lib
 SOUND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
 	$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -73,6 +73,9 @@ COND_PLATFORM_OS2_1___sound___os2_emxbindcmd = $(NM) sound$(EXEEXT) | if grep -q
 @COND_PLATFORM_OS2_1@__sound_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__sound_bundle___depname = sound_bundle
+@COND_TOOLKIT_COCOA@____sound_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@	sound.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____sound_BUNDLE_TGT_REF_DEP = sound.app/Contents/PkgInfo
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -104,7 +107,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
 	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
 	$(srcdir)/../../samples -i $(top_srcdir)/include -o sound$(EXEEXT) Carbon.r \
-	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -133,7 +136,7 @@ sound$(EXEEXT): $(SOUND_OBJECTS) $(__sound___win32rc)
 	$(__sound___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
 	mkdir -p sound.app/Contents
 	mkdir -p sound.app/Contents/MacOS
 	mkdir -p sound.app/Contents/Resources
@@ -142,7 +145,7 @@ sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/sound/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >sound.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >sound.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >sound.app/Contents/PkgInfo
@@ -151,14 +154,14 @@ sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $
 	ln -f sound$(EXEEXT) sound.app/Contents/MacOS/sound
 	
 	
-	ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc sound.app/Contents/Resources/sound.rsrc
-	ln -sf $(top_srcdir)/src/mac/wxmac.icns sound.app/Contents/Resources/wxmac.icns
+	cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc sound.app/Contents/Resources/sound.rsrc
+	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns sound.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@sound_bundle: sound.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@sound_bundle: $(____sound_BUNDLE_TGT_REF_DEP)
 
 data: 
 	@mkdir -p .
-	@for f in doggrowl.wav; do \
+	@for f in 9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav; do \
 	if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
 	cp -pRf $(srcdir)/$$f . ; \
 	fi; \