removed redundant wx_PPC.rsrc from project as well as ftp, java and x86 related Prefe...

[wxWidgets.git] / tests / Makefile.in

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 26df18762cdddadb96af022ae8b4b3190cf07cfc..9923a9250e7972b4b10b79864bb0e6cd14a0f4fc 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -53,7 +53,9 @@ TEST_OBJECTS =  \
        test_ffilestream.o \
        test_filestream.o \
        test_memstream.o \
        test_ffilestream.o \
        test_filestream.o \
        test_memstream.o \

-       test_zlibstream.o
+       test_zlibstream.o \
+       test_fontmap.o \
+       test_datetime.o

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 


@@ -119,13 +121,9 @@ test$(EXEEXT): $(TEST_OBJECTS)
 data: 
        @mkdir -p .
        @for f in testdata.fc; do \
 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; \
        fi; \

-       case "$$x" in ?*) \
-       cp -pRf $(srcdir)/$$f . ;; \
-       esac; \

        done
 
 test_test.o: $(srcdir)/test.cpp
        done
 
 test_test.o: $(srcdir)/test.cpp


@@ -182,6 +180,12 @@ test_memstream.o: $(srcdir)/streams/memstream.cpp
 test_zlibstream.o: $(srcdir)/streams/zlibstream.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
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d