From 112d35a2cbbd58fc98a020d22b5c40ada18507d7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 21 Dec 1999 01:47:00 +0000
Subject: [PATCH] removed date.cpp and time.cpp from the makefiles

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 Makefile.in                    | 18 +-----------------
 distrib/msw/tmake/filelist.txt |  4 ++--
 src/msw/makefile.b32           |  8 +-------
 src/msw/makefile.bcc           |  8 +-------
 src/msw/makefile.dos           | 14 +-------------
 src/msw/makefile.g95           |  4 +---
 src/msw/makefile.sc            |  4 +---
 src/msw/makefile.vc            | 20 ++++++++++++++------
 src/msw/makefile.wat           | 10 +---------
 9 files changed, 23 insertions(+), 67 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index fdcfe6c820..090b3d9b15 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 17:50, 1999/12/18
+# This file was automatically generated by tmake at 02:45, 1999/12/21
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -716,7 +716,6 @@ GTK_COMMONOBJS = \
 		config.o \
 		ctrlcmn.o \
 		ctrlsub.o \
-		date.o \
 		datetime.o \
 		datstrm.o \
 		db.o \
@@ -787,7 +786,6 @@ GTK_COMMONOBJS = \
 		tbarbase.o \
 		textcmn.o \
 		textfile.o \
-		time.o \
 		timercmn.o \
 		tokenzr.o \
 		txtstrm.o \
@@ -814,7 +812,6 @@ GTK_COMMONDEPS = \
 		config.d \
 		ctrlcmn.d \
 		ctrlsub.d \
-		date.d \
 		datetime.d \
 		datstrm.d \
 		db.d \
@@ -885,7 +882,6 @@ GTK_COMMONDEPS = \
 		tbarbase.d \
 		textcmn.d \
 		textfile.d \
-		time.d \
 		timercmn.d \
 		tokenzr.d \
 		txtstrm.d \
@@ -1110,7 +1106,6 @@ MOTIF_COMMONOBJS = \
 		config.o \
 		ctrlcmn.o \
 		ctrlsub.o \
-		date.o \
 		datetime.o \
 		datstrm.o \
 		db.o \
@@ -1181,7 +1176,6 @@ MOTIF_COMMONOBJS = \
 		tbarbase.o \
 		textcmn.o \
 		textfile.o \
-		time.o \
 		timercmn.o \
 		tokenzr.o \
 		txtstrm.o \
@@ -1208,7 +1202,6 @@ MOTIF_COMMONDEPS = \
 		config.d \
 		ctrlcmn.d \
 		ctrlsub.d \
-		date.d \
 		datetime.d \
 		datstrm.d \
 		db.d \
@@ -1279,7 +1272,6 @@ MOTIF_COMMONDEPS = \
 		tbarbase.d \
 		textcmn.d \
 		textfile.d \
-		time.d \
 		timercmn.d \
 		tokenzr.d \
 		txtstrm.d \
@@ -1460,7 +1452,6 @@ MSW_COMMONOBJS = \
 		config.o \
 		ctrlcmn.o \
 		ctrlsub.o \
-		date.o \
 		datetime.o \
 		datstrm.o \
 		db.o \
@@ -1532,7 +1523,6 @@ MSW_COMMONOBJS = \
 		tbarbase.o \
 		textcmn.o \
 		textfile.o \
-		time.o \
 		timercmn.o \
 		tokenzr.o \
 		txtstrm.o \
@@ -1559,7 +1549,6 @@ MSW_COMMONDEPS = \
 		config.d \
 		ctrlcmn.d \
 		ctrlsub.d \
-		date.d \
 		datetime.d \
 		datstrm.d \
 		db.d \
@@ -1631,7 +1620,6 @@ MSW_COMMONDEPS = \
 		tbarbase.d \
 		textcmn.d \
 		textfile.d \
-		time.d \
 		timercmn.d \
 		tokenzr.d \
 		txtstrm.d \
@@ -1835,7 +1823,6 @@ BASE_OBJS = \
 		init.o \
 		appcmn.o \
 		config.o \
-		date.o \
 		datetime.o \
 		dynarray.o \
 		dynlib.o \
@@ -1859,7 +1846,6 @@ BASE_OBJS = \
 		stream.o \
 		string.o \
 		textfile.o \
-		time.o \
 		timercmn.o \
 		tokenzr.o \
 		txtstrm.o \
@@ -1874,7 +1860,6 @@ BASE_DEPS = \
 		init.d \
 		appcmn.d \
 		config.d \
-		date.d \
 		datetime.d \
 		dynarray.d \
 		dynlib.d \
@@ -1898,7 +1883,6 @@ BASE_DEPS = \
 		stream.d \
 		string.d \
 		textfile.d \
-		time.d \
 		timercmn.d \
 		tokenzr.d \
 		txtstrm.d \
diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 895d832f73..a92bd9a4ae 100644
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -100,7 +100,7 @@ clipcmn.cpp	C
 config.cpp	C	B
 ctrlcmn.cpp	C
 ctrlsub.cpp	C
-date.cpp	C	B
+#date.cpp	C	B
 datetime.cpp	C	32,B
 datstrm.cpp	C
 db.cpp	C
@@ -173,7 +173,7 @@ string.cpp	C	B
 tbarbase.cpp	C
 textcmn.cpp	C
 textfile.cpp	C	B
-time.cpp	C	B
+#time.cpp	C	B
 timercmn.cpp	C	B
 tokenzr.cpp	C	B
 txtstrm.cpp	C	B
diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 1f69ef06fd..f453da3397 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 17:50, 1999/12/18
+# This file was automatically generated by tmake at 02:45, 1999/12/21
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -118,7 +118,6 @@ COMMONOBJS = \
 		$(MSWDIR)\config.obj \
 		$(MSWDIR)\ctrlcmn.obj \
 		$(MSWDIR)\ctrlsub.obj \
-		$(MSWDIR)\date.obj \
 		$(MSWDIR)\datetime.obj \
 		$(MSWDIR)\datstrm.obj \
 		$(MSWDIR)\db.obj \
@@ -190,7 +189,6 @@ COMMONOBJS = \
 		$(MSWDIR)\tbarbase.obj \
 		$(MSWDIR)\textcmn.obj \
 		$(MSWDIR)\textfile.obj \
-		$(MSWDIR)\time.obj \
 		$(MSWDIR)\timercmn.obj \
 		$(MSWDIR)\tokenzr.obj \
 		$(MSWDIR)\txtstrm.obj \
@@ -582,8 +580,6 @@ $(MSWDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF)
 
 $(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF)
 
-$(MSWDIR)\date.obj: $(COMMDIR)\date.$(SRCSUFF)
-
 $(MSWDIR)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF)
 
 $(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)
@@ -726,8 +722,6 @@ $(MSWDIR)\textcmn.obj: $(COMMDIR)\textcmn.$(SRCSUFF)
 
 $(MSWDIR)\textfile.obj: $(COMMDIR)\textfile.$(SRCSUFF)
 
-$(MSWDIR)\time.obj: $(COMMDIR)\time.$(SRCSUFF)
-
 $(MSWDIR)\timercmn.obj: $(COMMDIR)\timercmn.$(SRCSUFF)
 
 $(MSWDIR)\tokenzr.obj: $(COMMDIR)\tokenzr.$(SRCSUFF)
diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index a017250a0d..411ac38603 100644
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 17:50, 1999/12/18
+# This file was automatically generated by tmake at 02:45, 1999/12/21
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
@@ -108,7 +108,6 @@ COMMONOBJS = \
 		$(MSWDIR)\config.obj \
 		$(MSWDIR)\ctrlcmn.obj \
 		$(MSWDIR)\ctrlsub.obj \
-		$(MSWDIR)\date.obj \
 		$(MSWDIR)\datstrm.obj \
 		$(MSWDIR)\db.obj \
 		$(MSWDIR)\dbtable.obj \
@@ -162,7 +161,6 @@ COMMONOBJS = \
 		$(MSWDIR)\tbarbase.obj \
 		$(MSWDIR)\textcmn.obj \
 		$(MSWDIR)\textfile.obj \
-		$(MSWDIR)\time.obj \
 		$(MSWDIR)\timercmn.obj \
 		$(MSWDIR)\tokenzr.obj \
 		$(MSWDIR)\txtstrm.obj \
@@ -472,8 +470,6 @@ $(MSWDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF)
 
 $(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF)
 
-$(MSWDIR)\date.obj: $(COMMDIR)\date.$(SRCSUFF)
-
 $(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)
 
 $(MSWDIR)\db.obj: $(COMMDIR)\db.$(SRCSUFF)
@@ -580,8 +576,6 @@ $(MSWDIR)\textcmn.obj: $(COMMDIR)\textcmn.$(SRCSUFF)
 
 $(MSWDIR)\textfile.obj: $(COMMDIR)\textfile.$(SRCSUFF)
 
-$(MSWDIR)\time.obj: $(COMMDIR)\time.$(SRCSUFF)
-
 $(MSWDIR)\timercmn.obj: $(COMMDIR)\timercmn.$(SRCSUFF)
 
 $(MSWDIR)\tokenzr.obj: $(COMMDIR)\tokenzr.$(SRCSUFF)
diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 99f293ec82..2a0818210c 100644
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 17:50, 1999/12/18
+# This file was automatically generated by tmake at 02:45, 1999/12/21
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
@@ -94,7 +94,6 @@ COMMONOBJS1 = \
 		$(COMMDIR)\config.obj \
 		$(COMMDIR)\ctrlcmn.obj \
 		$(COMMDIR)\ctrlsub.obj \
-		$(COMMDIR)\date.obj \
 		$(COMMDIR)\datstrm.obj \
 		$(COMMDIR)\db.obj \
 		$(COMMDIR)\dbtable.obj \
@@ -151,7 +150,6 @@ COMMONOBJS2 = \
 		$(COMMDIR)\tbarbase.obj \
 		$(COMMDIR)\textcmn.obj \
 		$(COMMDIR)\textfile.obj \
-		$(COMMDIR)\time.obj \
 		$(COMMDIR)\timercmn.obj \
 		$(COMMDIR)\tokenzr.obj \
 		$(COMMDIR)\txtstrm.obj \
@@ -761,11 +759,6 @@ $(COMMDIR)/ctrlsub.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/date.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(COMMDIR)/datstrm.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1036,11 +1029,6 @@ $(COMMDIR)/textfile.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/time.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(COMMDIR)/timercmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 8155fada93..74d2837f3d 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 17:50, 1999/12/18
+# This file was automatically generated by tmake at 02:45, 1999/12/21
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -81,7 +81,6 @@ COMMONOBJS  = \
 		$(COMMDIR)/config.$(OBJSUFF) \
 		$(COMMDIR)/ctrlcmn.$(OBJSUFF) \
 		$(COMMDIR)/ctrlsub.$(OBJSUFF) \
-		$(COMMDIR)/date.$(OBJSUFF) \
 		$(COMMDIR)/datetime.$(OBJSUFF) \
 		$(COMMDIR)/datstrm.$(OBJSUFF) \
 		$(COMMDIR)/db.$(OBJSUFF) \
@@ -152,7 +151,6 @@ COMMONOBJS  = \
 		$(COMMDIR)/tbarbase.$(OBJSUFF) \
 		$(COMMDIR)/textcmn.$(OBJSUFF) \
 		$(COMMDIR)/textfile.$(OBJSUFF) \
-		$(COMMDIR)/time.$(OBJSUFF) \
 		$(COMMDIR)/timercmn.$(OBJSUFF) \
 		$(COMMDIR)/tokenzr.$(OBJSUFF) \
 		$(COMMDIR)/txtstrm.$(OBJSUFF) \
diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 7cff1ea421..652f2e71e7 100644
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 17:50, 1999/12/18
+# This file was automatically generated by tmake at 02:45, 1999/12/21
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects
@@ -55,7 +55,6 @@ COMMONOBJS = \
 		$(COMMDIR)\config.obj \
 		$(COMMDIR)\ctrlcmn.obj \
 		$(COMMDIR)\ctrlsub.obj \
-		$(COMMDIR)\date.obj \
 		$(COMMDIR)\datetime.obj \
 		$(COMMDIR)\datstrm.obj \
 		$(COMMDIR)\db.obj \
@@ -127,7 +126,6 @@ COMMONOBJS = \
 		$(COMMDIR)\tbarbase.obj \
 		$(COMMDIR)\textcmn.obj \
 		$(COMMDIR)\textfile.obj \
-		$(COMMDIR)\time.obj \
 		$(COMMDIR)\timercmn.obj \
 		$(COMMDIR)\tokenzr.obj \
 		$(COMMDIR)\txtstrm.obj \
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 61b59dccdd..fafb791651 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 17:50, 1999/12/18
+# This file was automatically generated by tmake at 02:45, 1999/12/21
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -134,7 +134,6 @@ COMMONOBJS = \
 		..\common\$D\config.obj \
 		..\common\$D\ctrlcmn.obj \
 		..\common\$D\ctrlsub.obj \
-		..\common\$D\date.obj \
 		..\common\$D\datetime.obj \
 		..\common\$D\datstrm.obj \
 		..\common\$D\db.obj \
@@ -206,7 +205,6 @@ COMMONOBJS = \
 		..\common\$D\tbarbase.obj \
 		..\common\$D\textcmn.obj \
 		..\common\$D\textfile.obj \
-		..\common\$D\time.obj \
 		..\common\$D\timercmn.obj \
 		..\common\$D\tokenzr.obj \
 		..\common\$D\txtstrm.obj \
@@ -347,7 +345,7 @@ HTMLOBJS = ..\html\$D\helpctrl.obj \
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 # Normal, static library
-all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)
+all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)
 
 dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D
 
@@ -433,7 +431,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
     $(link) @<<
     $(LINKFLAGS)
     -out:$(WXDIR)\lib\$(WXLIBNAME).dll
-    $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib $(WXDIR)\lib\jpeg.lib
+    $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib
 <<
 
 !endif
@@ -510,6 +508,16 @@ clean_jpeg:
     nmake -f makefile.vc clean
     cd $(WXDIR)\src\msw
 
+tiff:
+    cd $(WXDIR)\src\tiff
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)  CRTFLAG=$(CRTFLAG) all
+    cd $(WXDIR)\src\msw
+
+clean_tiff:
+    cd $(WXDIR)\src\tiff
+    nmake -f makefile.vc clean
+    cd $(WXDIR)\src\msw
+
 xpm:
     cd $(WXDIR)\src\xpm
     nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
@@ -525,7 +533,7 @@ rcparser:
     nmake -f makefile.vc FINAL=$(FINAL)
     cd $(WXDIR)\src\msw
 
-clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg 
+clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg clean_tiff
         -erase $(LIBTARGET)
         -erase $(WXDIR)\lib\$(WXLIBNAME).pdb
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 69c2d923f1..21d2e49c6c 100644
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,6 +1,6 @@
 #!/binb/wmake.exe
 
-# This file was automatically generated by tmake at 17:50, 1999/12/18
+# This file was automatically generated by tmake at 02:45, 1999/12/21
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
@@ -90,7 +90,6 @@ COMMONOBJS = &
 	config.obj &
 	ctrlcmn.obj &
 	ctrlsub.obj &
-	date.obj &
 	datetime.obj &
 	datstrm.obj &
 	db.obj &
@@ -161,7 +160,6 @@ COMMONOBJS = &
 	tbarbase.obj &
 	textcmn.obj &
 	textfile.obj &
-	time.obj &
 	timercmn.obj &
 	tokenzr.obj &
 	txtstrm.obj &
@@ -631,9 +629,6 @@ ctrlcmn.obj:     $(COMMDIR)\ctrlcmn.cpp
 ctrlsub.obj:     $(COMMDIR)\ctrlsub.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-date.obj:     $(COMMDIR)\date.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 datetime.obj:     $(COMMDIR)\datetime.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -844,9 +839,6 @@ textcmn.obj:     $(COMMDIR)\textcmn.cpp
 textfile.obj:     $(COMMDIR)\textfile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-time.obj:     $(COMMDIR)\time.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 timercmn.obj:     $(COMMDIR)\timercmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-- 
2.45.2