X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ceec2216bd3c65103e51a4ed9927f90fc1291d9c..fd5e476dbb9245a9ec755eeaa5b0e4b4556d2f8c:/tests/Makefile.in

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 5fe07254c7..5bd8a1367d 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -19,14 +19,15 @@ 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@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
@@ -39,15 +40,18 @@ 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_arrays.o \
+	test_datetime.o \
+	test_fileconf.o \
 	test_filename.o \
 	test_filesys.o \
-	test_arrays.o \
+	test_fontmap.o \
+	test_formatconverter.o \
 	test_hashes.o \
 	test_longlong.o \
+	test_main.o \
+	test_regex.o \
+	test_wxregex.o \
 	test_strings.o \
 	test_stdstrings.o \
 	test_unicode.o \
@@ -58,8 +62,7 @@ TEST_OBJECTS =  \
 	test_memstream.o \
 	test_sstream.o \
 	test_zlibstream.o \
-	test_fontmap.o \
-	test_datetime.o
+	test_uris.o
 
 ### Conditionally set variables: ###
 
@@ -72,15 +75,17 @@ 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 = \
-	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-2.5$(HOST_SUFFIX)
+	-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)$(WX_LIB_FLAVOUR)-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@	= \
@@ -94,7 +99,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
 @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_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)
@@ -120,9 +125,10 @@ 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_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 .
@@ -135,16 +141,13 @@ data:
 test_test.o: $(srcdir)/test.cpp
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
-test_main.o: $(srcdir)/mbconv/main.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_datetime.o: $(srcdir)/datetime/datetime.cpp
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
-test_wxregex.o: $(srcdir)/regex/wxregex.cpp
+test_fileconf.o: $(srcdir)/fileconf/fileconf.cpp
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
 test_filename.o: $(srcdir)/filename/filename.cpp
@@ -153,7 +156,10 @@ test_filename.o: $(srcdir)/filename/filename.cpp
 test_filesys.o: $(srcdir)/filesys/filesys.cpp
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
-test_arrays.o: $(srcdir)/arrays/arrays.cpp
+test_fontmap.o: $(srcdir)/fontmap/fontmap.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
+test_formatconverter.o: $(srcdir)/formatconverter/formatconverter.cpp
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
 test_hashes.o: $(srcdir)/hashes/hashes.cpp
@@ -162,6 +168,15 @@ test_hashes.o: $(srcdir)/hashes/hashes.cpp
 test_longlong.o: $(srcdir)/longlong/longlong.cpp
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
+test_main.o: $(srcdir)/mbconv/main.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
+
+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_strings.o: $(srcdir)/strings/strings.cpp
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
@@ -192,10 +207,7 @@ test_sstream.o: $(srcdir)/streams/sstream.cpp
 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
+test_uris.o: $(srcdir)/uris/uris.cpp
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<