patch [ 762159 ] scroll sample auto-scroll test

[wxWidgets.git] / tests / Makefile.in

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 610c3bd001947d079e919c921d940b707fd86bcb..9f6d9ec19a444dd85936d64b88118fa805b2f48a 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -40,16 +40,19 @@ 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_fileconf.o \
-       test_filename.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 \
@@ -60,8 +63,7 @@ TEST_OBJECTS =  \
        test_memstream.o \
        test_sstream.o \
        test_zlibstream.o \
-       test_fontmap.o \
-       test_datetime.o
+       test_uris.o
 
 ### Conditionally set variables: ###
 
@@ -80,6 +82,9 @@ 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_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)
@@ -124,7 +129,7 @@ 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_FOR_BASE)
+       $(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)
@@ -140,34 +145,43 @@ data:
 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_fileconf.o: $(srcdir)/fileconf/fileconf.cpp
+test_filenametest.o: $(srcdir)/filename/filenametest.cpp
        $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
-test_filename.o: $(srcdir)/filename/filename.cpp
+test_filesystest.o: $(srcdir)/filesys/filesystest.cpp
        $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
-test_filesys.o: $(srcdir)/filesys/filesys.cpp
+test_fontmaptest.o: $(srcdir)/fontmap/fontmaptest.cpp
        $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
-test_arrays.o: $(srcdir)/arrays/arrays.cpp
+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
@@ -200,10 +214,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) $<