X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7714864e2f21ef69ef273f3a7c58456e365539b9..dfecbee5795f4ecd50ece7dda7c1ff49f181a04d:/samples/richedit/Makefile.in

diff --git a/samples/richedit/Makefile.in b/samples/richedit/Makefile.in
index 21f1fea033..03e072a946 100644
--- a/samples/richedit/Makefile.in
+++ b/samples/richedit/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.7 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.5
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(top_builddir)lib
 RICHEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
 	$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -61,6 +61,10 @@ RICHEDIT_OBJECTS =  \
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
 @COND_PLATFORM_MAC_1@__richedit___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@	$(SETFILE) -a C richedit$(EXEEXT)
 @COND_PLATFORM_MAC_1@__richedit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -111,7 +115,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_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 richedit$(EXEEXT) \
-	Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
+	Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -131,16 +135,16 @@ clean:
 	rm -rf richedit.app
 
 distclean: clean
-	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 richedit$(EXEEXT): $(RICHEDIT_OBJECTS) $(__richedit___win32rc)
-	$(CXX) -o $@ $(RICHEDIT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
+	$(CXX) -o $@ $(RICHEDIT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI)
 	$(__richedit___mac_rezcmd)
 	$(__richedit___mac_setfilecmd)
 	$(__richedit___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-richedit.app/Contents/PkgInfo: richedit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+richedit.app/Contents/PkgInfo: richedit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
 	mkdir -p richedit.app/Contents
 	mkdir -p richedit.app/Contents/MacOS
 	mkdir -p richedit.app/Contents/Resources
@@ -158,7 +162,7 @@ richedit.app/Contents/PkgInfo: richedit$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
 	ln -f richedit$(EXEEXT) richedit.app/Contents/MacOS/richedit
 	
 	
-	cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc richedit.app/Contents/Resources/richedit.rsrc
+	cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc richedit.app/Contents/Resources/richedit.rsrc
 	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns richedit.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@richedit_bundle: $(____richedit_BUNDLE_TGT_REF_DEP)
@@ -166,28 +170,32 @@ richedit.app/Contents/PkgInfo: richedit$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
 data: 
 	@mkdir -p .
 	@for f in wxLayout.cpp; do \
-	if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
-	cp -pRf $(srcdir)/$$f . ; \
+	if test ! -e ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
 	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
 	done
 
 richedit_sample_rc.o: $(srcdir)/../../samples/sample.rc
-	$(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
+	$(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
 
 richedit_wxLayout.o: $(srcdir)/wxLayout.cpp
-	$(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $(srcdir)/wxLayout.cpp
 
 richedit_kbList.o: $(srcdir)/kbList.cpp
-	$(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $(srcdir)/kbList.cpp
 
 richedit_wxllist.o: $(srcdir)/wxllist.cpp
-	$(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $(srcdir)/wxllist.cpp
 
 richedit_wxlparser.o: $(srcdir)/wxlparser.cpp
-	$(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $(srcdir)/wxlparser.cpp
 
 richedit_wxlwindow.o: $(srcdir)/wxlwindow.cpp
-	$(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $(srcdir)/wxlwindow.cpp
 
 
 # Include dependency info, if present: