X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b0efa9a672287c89dc19c345ecf840f15c484c6..751731864888f00e31e6dce1092ac28a1fac5358:/samples/keyboard/Makefile.in?ds=sidebyside

diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in
index 478e18628c..ba5cac022c 100644
--- a/samples/keyboard/Makefile.in
+++ b/samples/keyboard/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!
 # =========================================================================
 
@@ -35,7 +35,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.1
+WX_VERSION = 2.5.2
 LIBDIRNAME = $(top_builddir)lib
 KEYBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
 	$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -70,6 +70,10 @@ COND_PLATFORM_OS2_1___keyboard___os2_emxbindcmd = $(NM) keyboard$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__keyboard_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__keyboard_bundle___depname = keyboard_bundle
+@COND_TOOLKIT_COCOA@____keyboard_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@	keyboard.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____keyboard_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	keyboard.app/Contents/PkgInfo
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -99,7 +103,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 keyboard$(EXEEXT) \
-	Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+	Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -128,7 +132,7 @@ keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc)
 	$(__keyboard___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
 	mkdir -p keyboard.app/Contents
 	mkdir -p keyboard.app/Contents/MacOS
 	mkdir -p keyboard.app/Contents/Resources
@@ -146,10 +150,10 @@ keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
 	ln -f keyboard$(EXEEXT) keyboard.app/Contents/MacOS/keyboard
 	
 	
-	ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc keyboard.app/Contents/Resources/keyboard.rsrc
-	ln -sf $(top_srcdir)/src/mac/wxmac.icns keyboard.app/Contents/Resources/wxmac.icns
+	cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc keyboard.app/Contents/Resources/keyboard.rsrc
+	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns keyboard.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@keyboard_bundle: keyboard.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@keyboard_bundle: $(____keyboard_BUNDLE_TGT_REF_DEP)
 
 keyboard_keyboard.o: $(srcdir)/keyboard.cpp
 	$(CXXC) -c -o $@ $(KEYBOARD_CXXFLAGS) $<