X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf8ee08b1bfb5680e2e199f3330ae93ef3a901a0..57ac1a563e2e0ccaa36472bae30e852d0806bc33:/tests/Makefile.in

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 26df18762c..9f6d9ec19a 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -19,12 +19,14 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
+WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
 CPPUNIT_LIBS = @CPPUNIT_LIBS@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
@@ -32,19 +34,25 @@ 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)
 TEST_OBJECTS =  \
 	test_test.o \
-	test_main.o \
-	test_formatconverter.o \
-	test_regex.o \
-	test_wxregex.o \
-	test_filesys.o \
+	test_archivetest.o \
 	test_arrays.o \
+	test_datetimetest.o \
+	test_fileconftest.o \
+	test_filenametest.o \
+	test_filesystest.o \
+	test_fontmaptest.o \
+	test_formatconvertertest.o \
 	test_hashes.o \
-	test_longlong.o \
+	test_longlongtest.o \
+	test_mbconvtest.o \
+	test_regextest.o \
+	test_wxregextest.o \
 	test_strings.o \
 	test_stdstrings.o \
 	test_unicode.o \
@@ -53,7 +61,9 @@ TEST_OBJECTS =  \
 	test_ffilestream.o \
 	test_filestream.o \
 	test_memstream.o \
-	test_zlibstream.o
+	test_sstream.o \
+	test_zlibstream.o \
+	test_uris.o
 
 ### Conditionally set variables: ###
 
@@ -66,32 +76,39 @@ TEST_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_PLATFORM_MAC_1@__test___mac_setfilecmd = \
 @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_NET_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)-$(WX_RELEASE)$(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_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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: ###
 
@@ -112,47 +129,59 @@ distclean: clean
 	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 test$(EXEEXT): $(TEST_OBJECTS)
-	$(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS)  $(__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)
+	$(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS)  $(__WXLIB_NET_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)
 	
-	$(__test___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK)
+	$(__test___mac_setfilecmd)
+	$(SAMPLES_RPATH_POSTLINK)
 
 data: 
 	@mkdir -p .
 	@for f in testdata.fc; do \
-	if test ! -e ./$$f ; \
-	then x=yep ; \
-	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
+	cp -pRf $(srcdir)/$$f . ; \
 	fi; \
-	case "$$x" in ?*) \
-	cp -pRf $(srcdir)/$$f . ;; \
-	esac; \
 	done
 
 test_test.o: $(srcdir)/test.cpp
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
-test_main.o: $(srcdir)/mbconv/main.cpp
+test_archivetest.o: $(srcdir)/archive/archivetest.cpp
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
-test_formatconverter.o: $(srcdir)/formatconverter/formatconverter.cpp
+test_arrays.o: $(srcdir)/arrays/arrays.cpp
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
-test_regex.o: $(srcdir)/regex/regex.cpp
+test_datetimetest.o: $(srcdir)/datetime/datetimetest.cpp
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
-test_wxregex.o: $(srcdir)/regex/wxregex.cpp
+test_fileconftest.o: $(srcdir)/fileconf/fileconftest.cpp
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
-test_filesys.o: $(srcdir)/filesys/filesys.cpp
+test_filenametest.o: $(srcdir)/filename/filenametest.cpp
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
-test_arrays.o: $(srcdir)/arrays/arrays.cpp
+test_filesystest.o: $(srcdir)/filesys/filesystest.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
+test_fontmaptest.o: $(srcdir)/fontmap/fontmaptest.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
+test_formatconvertertest.o: $(srcdir)/formatconverter/formatconvertertest.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
+test_longlongtest.o: $(srcdir)/longlong/longlongtest.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
+test_mbconvtest.o: $(srcdir)/mbconv/mbconvtest.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
+test_regextest.o: $(srcdir)/regex/regextest.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
+test_wxregextest.o: $(srcdir)/regex/wxregextest.cpp
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
 test_strings.o: $(srcdir)/strings/strings.cpp
@@ -179,9 +208,15 @@ test_filestream.o: $(srcdir)/streams/filestream.cpp
 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_uris.o: $(srcdir)/uris/uris.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d