X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf1014a2e11a3b06fecfb674a85a37120703a5c1..232ba4c3329127a3ae57e37dc088513d06fe436f:/tests/Makefile.in?ds=sidebyside

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 4529643214..58d64d41d6 100644
--- a/tests/Makefile.in
+++ b/tests/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!
 # =========================================================================
 
@@ -19,6 +19,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
+WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
 TOOLKIT = @TOOLKIT@
@@ -32,6 +33,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
+WX_RELEASE = 2.5
 LIBDIRNAME = $(top_builddir)lib
 TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
 	$(__DLLFLAG_p) $(CPPUNIT_CFLAGS) $(CPPFLAGS) $(CXXFLAGS)
@@ -40,8 +42,24 @@ TEST_OBJECTS =  \
 	test_main.o \
 	test_formatconverter.o \
 	test_regex.o \
+	test_wxregex.o \
+	test_filename.o \
 	test_filesys.o \
-	test_arrays.o
+	test_arrays.o \
+	test_hashes.o \
+	test_longlong.o \
+	test_strings.o \
+	test_stdstrings.o \
+	test_unicode.o \
+	test_crt.o \
+	test_bstream.o \
+	test_ffilestream.o \
+	test_filestream.o \
+	test_memstream.o \
+	test_sstream.o \
+	test_zlibstream.o \
+	test_fontmap.o \
+	test_datetime.o
 
 ### Conditionally set variables: ###
 
@@ -58,32 +76,34 @@ TEST_OBJECTS =  \
 @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL test$(EXEEXT)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
-@COND_MONOLITHIC_0@	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-2.5$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
 @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	-lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
 @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	-lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
 @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	-lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
 @COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
-@COND_WXUSE_REGEX_BUILTIN@	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
+COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 
 ### Targets: ###
 
-all: test$(EXEEXT)
+all: test$(EXEEXT) data
 
 install: all
 
@@ -104,6 +124,14 @@ test$(EXEEXT): $(TEST_OBJECTS)
 	
 	$(__test___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK)
 
+data: 
+	@mkdir -p .
+	@for f in testdata.fc; do \
+	if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
+	cp -pRf $(srcdir)/$$f . ; \
+	fi; \
+	done
+
 test_test.o: $(srcdir)/test.cpp
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
@@ -116,14 +144,62 @@ test_formatconverter.o: $(srcdir)/formatconverter/formatconverter.cpp
 test_regex.o: $(srcdir)/regex/regex.cpp
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
+test_wxregex.o: $(srcdir)/regex/wxregex.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
+test_filename.o: $(srcdir)/filename/filename.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
 test_filesys.o: $(srcdir)/filesys/filesys.cpp
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
 test_arrays.o: $(srcdir)/arrays/arrays.cpp
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
+test_hashes.o: $(srcdir)/hashes/hashes.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
+test_longlong.o: $(srcdir)/longlong/longlong.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
+test_strings.o: $(srcdir)/strings/strings.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
+test_stdstrings.o: $(srcdir)/strings/stdstrings.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
+test_unicode.o: $(srcdir)/strings/unicode.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
+test_crt.o: $(srcdir)/strings/crt.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
+test_bstream.o: $(srcdir)/streams/bstream.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
+test_ffilestream.o: $(srcdir)/streams/ffilestream.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
+test_filestream.o: $(srcdir)/streams/filestream.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
+test_memstream.o: $(srcdir)/streams/memstream.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
+test_sstream.o: $(srcdir)/streams/sstream.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
+test_zlibstream.o: $(srcdir)/streams/zlibstream.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
+test_fontmap.o: $(srcdir)/fontmap/fontmap.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
+test_datetime.o: $(srcdir)/datetime/datetime.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all install uninstall clean distclean
+.PHONY: all install uninstall clean distclean data