X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4818141bb228bbb59df63de12a5ea31801314b57..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/samples/controls/Makefile.in?ds=inline

diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in
index 756c4ffac1..b3bc63631c 100644
--- a/samples/controls/Makefile.in
+++ b/samples/controls/Makefile.in
@@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
@@ -37,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.6
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).1
 LIBDIRNAME = $(top_builddir)lib
 CONTROLS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
@@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
 	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
 	$(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
 	$(srcdir)/../../samples -i $(top_srcdir)/include -o controls$(EXEEXT) \
-	Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+	Carbon.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -151,7 +150,7 @@ controls$(EXEEXT): $(CONTROLS_OBJECTS) $(__controls___win32rc)
 	$(__controls___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
 	mkdir -p controls.app/Contents
 	mkdir -p controls.app/Contents/MacOS
 	mkdir -p controls.app/Contents/Resources
@@ -169,7 +168,6 @@ controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
 	ln -f controls$(EXEEXT) controls.app/Contents/MacOS/controls
 	
 	
-	cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc controls.app/Contents/Resources/controls.rsrc
 	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns controls.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@controls_bundle: $(____controls_BUNDLE_TGT_REF_DEP)
@@ -177,7 +175,7 @@ controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
 data: 
 	@mkdir -p .
 	@for f in test2.bmp; do \
-	if test ! -e ./$$f ; \
+	if test ! -f ./$$f ; \
 	then x=yep ; \
 	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
 	fi; \