Regenerated makefiles.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

tests/Makefile.in

@@ -54,7 +54,8 @@ TEST_OBJECTS =  \
 	test_filestream.o \
 	test_memstream.o \
 	test_zlibstream.o \
-	test_fontmap.o
+	test_fontmap.o \
+	test_datetime.o
 
 ### Conditionally set variables: ###
 
@@ -120,13 +121,9 @@ test$(EXEEXT): $(TEST_OBJECTS)
 data: 
 	@mkdir -p .
 	@for f in testdata.fc; do \
-	if test ! -e ./$$f ; \
+	if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
-	then x=yep ; \
+	cp -pRf $(srcdir)/$$f . ; \
-	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
 	fi; \
-	case "$$x" in ?*) \
-	cp -pRf $(srcdir)/$$f . ;; \
-	esac; \
 	done
 
 test_test.o: $(srcdir)/test.cpp
@@ -186,6 +183,9 @@ test_zlibstream.o: $(srcdir)/streams/zlibstream.cpp
 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

tests/makefile.bcc

@@ -48,7 +48,8 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_filestream.obj \
 	$(OBJS)\test_memstream.obj \
 	$(OBJS)\test_zlibstream.obj \
-	$(OBJS)\test_fontmap.obj
+	$(OBJS)\test_fontmap.obj \
+	$(OBJS)\test_datetime.obj
 
 ### Conditionally set variables: ###
 
@@ -228,3 +229,6 @@ $(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp
 
 $(OBJS)\test_fontmap.obj: .\fontmap\fontmap.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_datetime.obj: .\datetime\datetime.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**

tests/makefile.gcc

@@ -39,7 +39,8 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_filestream.o \
 	$(OBJS)\test_memstream.o \
 	$(OBJS)\test_zlibstream.o \
-	$(OBJS)\test_fontmap.o
+	$(OBJS)\test_fontmap.o \
+	$(OBJS)\test_datetime.o
 
 ### Conditionally set variables: ###
 
@@ -223,4 +224,7 @@ $(OBJS)\test_zlibstream.o: ./streams/zlibstream.cpp
 $(OBJS)\test_fontmap.o: ./fontmap/fontmap.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_datetime.o: ./datetime/datetime.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
 .PHONY: all clean data

tests/makefile.vc

@@ -41,7 +41,8 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_filestream.obj \
 	$(OBJS)\test_memstream.obj \
 	$(OBJS)\test_zlibstream.obj \
-	$(OBJS)\test_fontmap.obj
+	$(OBJS)\test_fontmap.obj \
+	$(OBJS)\test_datetime.obj
 
 ### Conditionally set variables: ###
 
@@ -284,3 +285,6 @@ $(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp
 
 $(OBJS)\test_fontmap.obj: .\fontmap\fontmap.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_datetime.obj: .\datetime\datetime.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**

tests/makefile.wat

@@ -103,13 +103,6 @@ __RUNTIME_LIBS_5 = -br
 !ifeq RUNTIME_LIBS static
 __RUNTIME_LIBS_5 = 
 !endif
-__EXCEPTIONSFLAG_6 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_6 = 
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_6 = -xr
-!endif
 __EXCEPTIONSFLAG_7 =
 !ifeq USE_EXCEPTIONS 0
 __EXCEPTIONSFLAG_7 = 
@@ -176,7 +169,7 @@ SETUPHDIR = &
 TEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) &
 	-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
 	-i=.\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) $(CPPUNIT_CFLAGS) &
-	$(__EXCEPTIONSFLAG_6) $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
+	$(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
 TEST_OBJECTS =  &
 	$(OBJS)\test_test.obj &
 	$(OBJS)\test_main.obj &
@@ -196,7 +189,8 @@ TEST_OBJECTS =  &
 	$(OBJS)\test_filestream.obj &
 	$(OBJS)\test_memstream.obj &
 	$(OBJS)\test_zlibstream.obj &
-	$(OBJS)\test_fontmap.obj
+	$(OBJS)\test_fontmap.obj &
+	$(OBJS)\test_datetime.obj
 
 
 all : $(OBJS)
@@ -285,3 +279,6 @@ $(OBJS)\test_zlibstream.obj :  .AUTODEPEND .\streams\zlibstream.cpp
 
 $(OBJS)\test_fontmap.obj :  .AUTODEPEND .\fontmap\fontmap.cpp
 	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_datetime.obj :  .AUTODEPEND .\datetime\datetime.cpp
+	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<

tests/test.bkl

@@ -27,6 +27,7 @@
             streams/memstream.cpp
             streams/zlibstream.cpp
             fontmap/fontmap.cpp
+            datetime/datetime.cpp
         </sources>
         <wx-lib>base</wx-lib>
     </exe>

tests/test.dsp

@@ -439,10 +439,6 @@ SOURCE=.\arrays\arrays.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\datetime\datetime.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\streams\bstream.cpp
 # End Source File
 # Begin Source File
@@ -451,6 +447,10 @@ SOURCE=.\strings\crt.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\datetime\datetime.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\streams\ffilestream.cpp
 # End Source File
 # Begin Source File