X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c7a2bf27dad5df0119ad09970cf2712848278d97..b3402d0df8c9f763da1e32fc28c824014e5516c6:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index d1aa51d6eb..c5796a704f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 17:13, 1999/11/28
+# This file was automatically generated by tmake at 18:11, 2000/01/10
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -96,6 +96,8 @@ host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
 
+USE_GUI=@USE_GUI@
+
 ############################# Dirs #################################
 
 WXDIR = $(top_srcdir)
@@ -109,6 +111,7 @@ HTMLDIR  = $(WXDIR)/src/html
 UNIXDIR  = $(WXDIR)/src/unix
 PNGDIR   = $(WXDIR)/src/png
 JPEGDIR  = $(WXDIR)/src/jpeg
+TIFFDIR  = $(WXDIR)/src/tiff
 ZLIBDIR  = $(WXDIR)/src/zlib
 GTKDIR   = $(WXDIR)/src/gtk
 MOTIFDIR = $(WXDIR)/src/motif
@@ -131,9 +134,13 @@ DISTDIR = ./_dist_dir/wx$(TOOLKIT)
 
 BASE_HEADERS = \
 		app.h \
+		buffer.h \
+		cmdline.h \
 		date.h \
+		datetime.h \
 		debug.h \
 		defs.h \
+		dir.h \
 		dynarray.h \
 		dynlib.h \
 		event.h \
@@ -142,14 +149,15 @@ BASE_HEADERS = \
 		fileconf.h \
 		hash.h \
 		intl.h \
+		ioswrap.h \
 		list.h \
 		log.h \
 		longlong.h \
+		memory.h \
 		mimetype.h \
 		module.h \
 		object.h \
 		process.h \
-		setup.h \
 		strconv.h \
 		stream.h \
 		string.h \
@@ -162,6 +170,7 @@ BASE_HEADERS = \
 		utils.h \
 		variant.h \
 		version.h \
+		wfstream.h \
 		wx.h \
 		wxchar.h \
 		wxprec.h
@@ -176,12 +185,14 @@ WX_HEADERS = \
 		buffer.h \
 		busyinfo.h \
 		button.h \
+		calctrl.h \
 		caret.h \
 		checkbox.h \
 		checklst.h \
 		choicdlg.h \
 		choice.h \
 		clipbrd.h \
+		cmdline.h \
 		cmndata.h \
 		colordlg.h \
 		colour.h \
@@ -193,6 +204,7 @@ WX_HEADERS = \
 		cursor.h \
 		dataobj.h \
 		date.h \
+		datetime.h \
 		datstrm.h \
 		db.h \
 		dbtable.h \
@@ -207,6 +219,7 @@ WX_HEADERS = \
 		defs.h \
 		dialog.h \
 		dialup.h \
+		dir.h \
 		dirdlg.h \
 		dnd.h \
 		docmdi.h \
@@ -214,6 +227,7 @@ WX_HEADERS = \
 		dragimag.h \
 		dynarray.h \
 		dynlib.h \
+		encconv.h \
 		event.h \
 		expr.h \
 		ffile.h \
@@ -243,8 +257,15 @@ WX_HEADERS = \
 		helpwin.h \
 		helpxlp.h \
 		icon.h \
+		imagbmp.h \
 		image.h \
+		imaggif.h \
+		imagjpeg.h \
 		imaglist.h \
+		imagpcx.h \
+		imagpng.h \
+		imagpnm.h \
+		imagtiff.h \
 		intl.h \
 		ioswrap.h \
 		ipcbase.h \
@@ -277,7 +298,6 @@ WX_HEADERS = \
 		panel.h \
 		paper.h \
 		pen.h \
-		pnghand.h \
 		print.h \
 		printdlg.h \
 		prntbase.h \
@@ -316,9 +336,7 @@ WX_HEADERS = \
 		tab.h \
 		tabctrl.h \
 		taskbar.h \
-		tbar95.h \
 		tbarbase.h \
-		tbarmsw.h \
 		tbarsmpl.h \
 		textctrl.h \
 		textdlg.h \
@@ -534,8 +552,6 @@ MSW_HEADERS = \
 		msw/notebook.h \
 		msw/palette.h \
 		msw/pen.h \
-		msw/pnghand.h \
-		msw/pngread.h \
 		msw/printdlg.h \
 		msw/printwin.h \
 		msw/private.h \
@@ -574,6 +590,7 @@ UNIX_HEADERS = \
 		unix/fontutil.h
 
 GENERIC_HEADERS = \
+		generic/calctrl.h \
 		generic/caret.h \
 		generic/choicdgg.h \
 		generic/colrdlgg.h \
@@ -602,7 +619,8 @@ GENERIC_HEADERS = \
 		generic/statusbr.h \
 		generic/tabg.h \
 		generic/textdlgg.h \
-		generic/treectrl.h
+		generic/treectrl.h \
+		generic/wizard.h
 
 PROTOCOL_HEADERS = \
 		protocol/file.h \
@@ -627,6 +645,7 @@ HTML_HEADERS = \
 
 GTK_GENERICOBJS = \
 		busyinfo.o \
+		calctrl.o \
 		caret.o \
 		choicdgg.o \
 		colrdlgg.o \
@@ -655,6 +674,7 @@ GTK_GENERICOBJS = \
 		splitter.o \
 		statusbr.o \
 		tabg.o \
+		tbarsmpl.o \
 		textdlgg.o \
 		tipdlg.o \
 		treectrl.o \
@@ -662,6 +682,7 @@ GTK_GENERICOBJS = \
 
 GTK_GENERICDEPS = \
 		busyinfo.d \
+		calctrl.d \
 		caret.d \
 		choicdgg.d \
 		colrdlgg.d \
@@ -690,6 +711,7 @@ GTK_GENERICDEPS = \
 		splitter.d \
 		statusbr.d \
 		tabg.d \
+		tbarsmpl.d \
 		textdlgg.d \
 		tipdlg.d \
 		treectrl.d \
@@ -700,11 +722,12 @@ GTK_COMMONOBJS = \
 		appcmn.o \
 		choiccmn.o \
 		clipcmn.o \
+		cmdline.o \
 		cmndata.o \
 		config.o \
 		ctrlcmn.o \
 		ctrlsub.o \
-		date.o \
+		datetime.o \
 		datstrm.o \
 		db.o \
 		dbtable.o \
@@ -715,6 +738,7 @@ GTK_COMMONOBJS = \
 		docview.o \
 		dynarray.o \
 		dynlib.o \
+		encconv.o \
 		event.o \
 		extended.o \
 		ffile.o \
@@ -748,6 +772,7 @@ GTK_COMMONOBJS = \
 		lboxcmn.o \
 		list.o \
 		log.o \
+		longlong.o \
 		memory.o \
 		menucmn.o \
 		mimetype.o \
@@ -771,10 +796,8 @@ GTK_COMMONOBJS = \
 		stream.o \
 		string.o \
 		tbarbase.o \
-		tbarsmpl.o \
 		textcmn.o \
 		textfile.o \
-		time.o \
 		timercmn.o \
 		tokenzr.o \
 		txtstrm.o \
@@ -797,11 +820,12 @@ GTK_COMMONDEPS = \
 		appcmn.d \
 		choiccmn.d \
 		clipcmn.d \
+		cmdline.d \
 		cmndata.d \
 		config.d \
 		ctrlcmn.d \
 		ctrlsub.d \
-		date.d \
+		datetime.d \
 		datstrm.d \
 		db.d \
 		dbtable.d \
@@ -812,6 +836,7 @@ GTK_COMMONDEPS = \
 		docview.d \
 		dynarray.d \
 		dynlib.d \
+		encconv.d \
 		event.d \
 		extended.d \
 		ffile.d \
@@ -845,6 +870,7 @@ GTK_COMMONDEPS = \
 		lboxcmn.d \
 		list.d \
 		log.d \
+		longlong.d \
 		memory.d \
 		menucmn.d \
 		mimetype.d \
@@ -868,10 +894,8 @@ GTK_COMMONDEPS = \
 		stream.d \
 		string.d \
 		tbarbase.d \
-		tbarsmpl.d \
 		textcmn.d \
 		textfile.d \
-		time.d \
 		timercmn.d \
 		tokenzr.d \
 		txtstrm.d \
@@ -1011,6 +1035,7 @@ GTK_GUIDEPS = \
 
 MOTIF_GENERICOBJS = \
 		busyinfo.o \
+		calctrl.o \
 		caret.o \
 		choicdgg.o \
 		colrdlgg.o \
@@ -1042,6 +1067,7 @@ MOTIF_GENERICOBJS = \
 		statline.o \
 		statusbr.o \
 		tabg.o \
+		tbarsmpl.o \
 		textdlgg.o \
 		tipdlg.o \
 		treectrl.o \
@@ -1049,6 +1075,7 @@ MOTIF_GENERICOBJS = \
 
 MOTIF_GENERICDEPS = \
 		busyinfo.d \
+		calctrl.d \
 		caret.d \
 		choicdgg.d \
 		colrdlgg.d \
@@ -1080,6 +1107,7 @@ MOTIF_GENERICDEPS = \
 		statline.d \
 		statusbr.d \
 		tabg.d \
+		tbarsmpl.d \
 		textdlgg.d \
 		tipdlg.d \
 		treectrl.d \
@@ -1090,11 +1118,12 @@ MOTIF_COMMONOBJS = \
 		appcmn.o \
 		choiccmn.o \
 		clipcmn.o \
+		cmdline.o \
 		cmndata.o \
 		config.o \
 		ctrlcmn.o \
 		ctrlsub.o \
-		date.o \
+		datetime.o \
 		datstrm.o \
 		db.o \
 		dbtable.o \
@@ -1105,6 +1134,7 @@ MOTIF_COMMONOBJS = \
 		docview.o \
 		dynarray.o \
 		dynlib.o \
+		encconv.o \
 		event.o \
 		extended.o \
 		ffile.o \
@@ -1138,6 +1168,7 @@ MOTIF_COMMONOBJS = \
 		lboxcmn.o \
 		list.o \
 		log.o \
+		longlong.o \
 		memory.o \
 		menucmn.o \
 		mimetype.o \
@@ -1161,10 +1192,8 @@ MOTIF_COMMONOBJS = \
 		stream.o \
 		string.o \
 		tbarbase.o \
-		tbarsmpl.o \
 		textcmn.o \
 		textfile.o \
-		time.o \
 		timercmn.o \
 		tokenzr.o \
 		txtstrm.o \
@@ -1187,11 +1216,12 @@ MOTIF_COMMONDEPS = \
 		appcmn.d \
 		choiccmn.d \
 		clipcmn.d \
+		cmdline.d \
 		cmndata.d \
 		config.d \
 		ctrlcmn.d \
 		ctrlsub.d \
-		date.d \
+		datetime.d \
 		datstrm.d \
 		db.d \
 		dbtable.d \
@@ -1202,6 +1232,7 @@ MOTIF_COMMONDEPS = \
 		docview.d \
 		dynarray.d \
 		dynlib.d \
+		encconv.d \
 		event.d \
 		extended.d \
 		ffile.d \
@@ -1235,6 +1266,7 @@ MOTIF_COMMONDEPS = \
 		lboxcmn.d \
 		list.d \
 		log.d \
+		longlong.d \
 		memory.d \
 		menucmn.d \
 		mimetype.d \
@@ -1258,10 +1290,8 @@ MOTIF_COMMONDEPS = \
 		stream.d \
 		string.d \
 		tbarbase.d \
-		tbarsmpl.d \
 		textcmn.d \
 		textfile.d \
-		time.d \
 		timercmn.d \
 		tokenzr.d \
 		txtstrm.d \
@@ -1391,6 +1421,7 @@ MOTIF_GUIDEPS = \
 
 MSW_GENERICOBJS = \
 		busyinfo.o \
+		calctrl.o \
 		choicdgg.o \
 		dirdlgg.o \
 		grid.o \
@@ -1406,13 +1437,14 @@ MSW_GENERICOBJS = \
 		scrolwin.o \
 		splitter.o \
 		statusbr.o \
-		tabg.o \
+		tbarsmpl.o \
 		textdlgg.o \
 		tipdlg.o \
 		wizard.o
 
 MSW_GENERICDEPS = \
 		busyinfo.d \
+		calctrl.d \
 		choicdgg.d \
 		dirdlgg.d \
 		grid.d \
@@ -1428,7 +1460,7 @@ MSW_GENERICDEPS = \
 		scrolwin.d \
 		splitter.d \
 		statusbr.d \
-		tabg.d \
+		tbarsmpl.d \
 		textdlgg.d \
 		tipdlg.d \
 		wizard.d
@@ -1438,11 +1470,12 @@ MSW_COMMONOBJS = \
 		appcmn.o \
 		choiccmn.o \
 		clipcmn.o \
+		cmdline.o \
 		cmndata.o \
 		config.o \
 		ctrlcmn.o \
 		ctrlsub.o \
-		date.o \
+		datetime.o \
 		datstrm.o \
 		db.o \
 		dbtable.o \
@@ -1453,6 +1486,7 @@ MSW_COMMONOBJS = \
 		docview.o \
 		dynarray.o \
 		dynlib.o \
+		encconv.o \
 		event.o \
 		extended.o \
 		ffile.o \
@@ -1486,6 +1520,7 @@ MSW_COMMONOBJS = \
 		lboxcmn.o \
 		list.o \
 		log.o \
+		longlong.o \
 		memory.o \
 		menucmn.o \
 		mimetype.o \
@@ -1510,10 +1545,8 @@ MSW_COMMONOBJS = \
 		stream.o \
 		string.o \
 		tbarbase.o \
-		tbarsmpl.o \
 		textcmn.o \
 		textfile.o \
-		time.o \
 		timercmn.o \
 		tokenzr.o \
 		txtstrm.o \
@@ -1536,11 +1569,12 @@ MSW_COMMONDEPS = \
 		appcmn.d \
 		choiccmn.d \
 		clipcmn.d \
+		cmdline.d \
 		cmndata.d \
 		config.d \
 		ctrlcmn.d \
 		ctrlsub.d \
-		date.d \
+		datetime.d \
 		datstrm.d \
 		db.d \
 		dbtable.d \
@@ -1551,6 +1585,7 @@ MSW_COMMONDEPS = \
 		docview.d \
 		dynarray.d \
 		dynlib.d \
+		encconv.d \
 		event.d \
 		extended.d \
 		ffile.d \
@@ -1584,6 +1619,7 @@ MSW_COMMONDEPS = \
 		lboxcmn.d \
 		list.d \
 		log.d \
+		longlong.d \
 		memory.d \
 		menucmn.d \
 		mimetype.d \
@@ -1608,10 +1644,8 @@ MSW_COMMONDEPS = \
 		stream.d \
 		string.d \
 		tbarbase.d \
-		tbarsmpl.d \
 		textcmn.d \
 		textfile.d \
-		time.d \
 		timercmn.d \
 		tokenzr.d \
 		txtstrm.d \
@@ -1658,6 +1692,7 @@ MSW_GUIOBJS = \
 		dialup.o \
 		dib.o \
 		dibutils.o \
+		dir.o \
 		dragimag.o \
 		filedlg.o \
 		font.o \
@@ -1688,7 +1723,6 @@ MSW_GUIOBJS = \
 		palette.o \
 		pen.o \
 		penwin.o \
-		pnghand.o \
 		printdlg.o \
 		printwin.o \
 		radiobox.o \
@@ -1749,6 +1783,7 @@ MSW_GUIDEPS = \
 		dialup.d \
 		dib.d \
 		dibutils.d \
+		dir.d \
 		dragimag.d \
 		filedlg.d \
 		font.d \
@@ -1779,7 +1814,6 @@ MSW_GUIDEPS = \
 		palette.d \
 		pen.d \
 		penwin.d \
-		pnghand.d \
 		printdlg.d \
 		printwin.d \
 		radiobox.d \
@@ -1814,8 +1848,9 @@ MSW_GUIDEPS = \
 BASE_OBJS = \
 		init.o \
 		appcmn.o \
+		cmdline.o \
 		config.o \
-		date.o \
+		datetime.o \
 		dynarray.o \
 		dynlib.o \
 		event.o \
@@ -1829,6 +1864,7 @@ BASE_OBJS = \
 		intl.o \
 		list.o \
 		log.o \
+		longlong.o \
 		mimetype.o \
 		module.o \
 		object.o \
@@ -1837,21 +1873,23 @@ BASE_OBJS = \
 		stream.o \
 		string.o \
 		textfile.o \
-		time.o \
 		timercmn.o \
 		tokenzr.o \
 		txtstrm.o \
 		utilscmn.o \
 		variant.o \
+		wfstream.o \
 		wxchar.o \
+		dir.o \
 		threadpsx.o \
 		utilsunx.o
 
 BASE_DEPS = \
 		init.d \
 		appcmn.d \
+		cmdline.d \
 		config.d \
-		date.d \
+		datetime.d \
 		dynarray.d \
 		dynlib.d \
 		event.d \
@@ -1865,6 +1903,7 @@ BASE_DEPS = \
 		intl.d \
 		list.d \
 		log.d \
+		longlong.d \
 		mimetype.d \
 		module.d \
 		object.d \
@@ -1873,13 +1912,14 @@ BASE_DEPS = \
 		stream.d \
 		string.d \
 		textfile.d \
-		time.d \
 		timercmn.d \
 		tokenzr.d \
 		txtstrm.d \
 		utilscmn.d \
 		variant.d \
+		wfstream.d \
 		wxchar.d \
+		dir.d \
 		threadpsx.d \
 		utilsunx.d
 
@@ -1893,6 +1933,7 @@ HTMLOBJS = \
 		htmltag.o \
 		htmlwin.o \
 		htmprint.o \
+		m_dflist.o \
 		m_fonts.o \
 		m_hline.o \
 		m_image.o \
@@ -1913,6 +1954,7 @@ HTMLDEPS = \
 		htmltag.d \
 		htmlwin.d \
 		htmprint.d \
+		m_dflist.d \
 		m_fonts.d \
 		m_hline.d \
 		m_image.d \
@@ -1925,6 +1967,7 @@ HTMLDEPS = \
 
 UNIX_OBJS = \
 		dialup.o \
+		dir.o \
 		fontenum.o \
 		fontutil.o \
 		gsocket.o \
@@ -1933,6 +1976,7 @@ UNIX_OBJS = \
 
 UNIX_DEPS = \
 		dialup.d \
+		dir.d \
 		fontenum.d \
 		fontutil.d \
 		gsocket.d \
@@ -2038,6 +2082,7 @@ TIFFOBJS	= \
 		tif_jpeg.o \
 		tif_flush.o \
 		tif_lzw.o \
+		tif_luv.o \
 		tif_next.o \
 		tif_open.o \
 		tif_packbits.o \
@@ -2089,6 +2134,8 @@ DEPFILES = @ALL_DEPFILES@
 
 HEADERS = @ALL_HEADERS@
 
+BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
+
 all: @WX_ALL@
 
 @WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
@@ -2098,7 +2145,7 @@ all: @WX_ALL@
 
 @WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
 	@$(INSTALL) -d ./lib
-	$(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
+	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
 	
 CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
 	@$(RM) ./lib/@WX_LIBRARY_LINK1@
@@ -2141,6 +2188,14 @@ lexer.c:	$(COMMDIR)/lexer.l
 
 -include $(DEPFILES)
 
+afminstall:
+	$(INSTALL) -d $(datadir)
+	$(INSTALL) -d $(datadir)/wx
+	$(INSTALL) -d $(datadir)/wx/afm
+	$(INSTALL) -d $(datadir)/wx/gs_afm
+	$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
+	$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
+	
 preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
 	@echo " "
 	@echo " Installing wxWindows..."
@@ -2149,7 +2204,6 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
 	$(INSTALL) -d $(prefix)
 	$(INSTALL) -d $(bindir)
 	$(INSTALL) -d $(libdir)
-	$(INSTALL) -d $(datadir)
 
 	$(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
 	$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
@@ -2160,20 +2214,11 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
 	$(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
 	$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
 	
-	$(INSTALL) -d $(datadir)/wx
-	$(INSTALL) -d $(datadir)/wx/afm
-	$(INSTALL) -d $(datadir)/wx/gs_afm
-	$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
-	$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
-	
 	$(INSTALL) -d $(includedir)/wx
-	$(INSTALL) -d $(includedir)/wx/msw
-	$(INSTALL) -d $(includedir)/wx/gtk
-	$(INSTALL) -d $(includedir)/wx/motif
-	$(INSTALL) -d $(includedir)/wx/html
-	$(INSTALL) -d $(includedir)/wx/protocol
-	$(INSTALL) -d $(includedir)/wx/unix
-	$(INSTALL) -d $(includedir)/wx/generic
+    @if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
+	@if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/protocol; fi
+	@if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/unix; fi
+	@if test "$USE_GUI" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
 	@list='$(HEADERS)'; for p in $$list; do \
 	  $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
 	  echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
@@ -2191,7 +2236,7 @@ write_message:
 	@echo " Read the wxWindows Licence on licencing conditions."
 	@echo " "
 
-install: preinstall @WX_ALL_INSTALLED@ write_message
+install: preinstall @AFMINSTALL@ @WX_ALL_INSTALLED@ write_message
 
 uninstall:
 	@echo " "
@@ -2256,6 +2301,7 @@ ALL_DIST:
 	mkdir $(DISTDIR)/include/wx/unix
 	mkdir $(DISTDIR)/include/wx/protocol
 	cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx 
+	cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx 
 	cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
 	cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
 	cp $(INCDIR)/wx/generic/*.xpm $(DISTDIR)/include/wx/generic
@@ -2271,6 +2317,7 @@ ALL_DIST:
 	mkdir $(DISTDIR)/src/unix
 	mkdir $(DISTDIR)/src/png
 	mkdir $(DISTDIR)/src/jpeg
+	mkdir $(DISTDIR)/src/tiff
 	mkdir $(DISTDIR)/src/zlib
 	mkdir $(DISTDIR)/src/iodbc
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
@@ -2294,6 +2341,9 @@ ALL_DIST:
 	cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
 	cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
 	cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
+	cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff
+	cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff
+	cp $(TIFFDIR)/README $(DISTDIR)/src/tiff
 	cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
 	cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc
 	cp $(ODBCDIR)/*.ci $(DISTDIR)/src/iodbc
@@ -2351,11 +2401,21 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/caret/*.cpp $(DISTDIR)/samples/caret
 	cp $(SAMPDIR)/caret/*.xpm $(DISTDIR)/samples/caret
 	
+	mkdir $(DISTDIR)/samples/calendar
+	cp $(SAMPDIR)/calendar/Makefile.in $(DISTDIR)/samples/calendar
+	cp $(SAMPDIR)/calendar/makefile.unx $(DISTDIR)/samples/calendar
+	cp $(SAMPDIR)/calendar/*.cpp $(DISTDIR)/samples/calendar
+	
 	mkdir $(DISTDIR)/samples/config
 	cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config
 	cp $(SAMPDIR)/config/makefile.unx $(DISTDIR)/samples/config
 	cp $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config
 	
+	mkdir $(DISTDIR)/samples/console
+	cp $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console
+	cp $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
+	cp $(SAMPDIR)/console/*.cpp $(DISTDIR)/samples/console
+	
 	mkdir $(DISTDIR)/samples/controls
 	mkdir $(DISTDIR)/samples/controls/icons
 	cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls
@@ -2370,14 +2430,6 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst
 	cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
 	
-	mkdir $(DISTDIR)/samples/printing
-	cp $(SAMPDIR)/printing/Makefile.in $(DISTDIR)/samples/printing
-	cp $(SAMPDIR)/printing/makefile.unx $(DISTDIR)/samples/printing
-	cp $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing
-	cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
-	cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
-	cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
-	
 	mkdir $(DISTDIR)/samples/db
 	cp $(SAMPDIR)/db/Makefile.in $(DISTDIR)/samples/db
 	cp $(SAMPDIR)/db/makefile.unx $(DISTDIR)/samples/db
@@ -2429,15 +2481,26 @@ SAMPLES_DIST:
 	mkdir $(DISTDIR)/samples/forty
 	cp $(SAMPDIR)/forty/Makefile.in $(DISTDIR)/samples/forty
 	cp $(SAMPDIR)/forty/makefile.unx $(DISTDIR)/samples/forty
+	cp $(SAMPDIR)/forty/*.h $(DISTDIR)/samples/forty
 	cp $(SAMPDIR)/forty/*.cpp $(DISTDIR)/samples/forty
 	cp $(SAMPDIR)/forty/*.xpm $(DISTDIR)/samples/forty
 	cp $(SAMPDIR)/forty/*.xbm $(DISTDIR)/samples/forty
 	
+	mkdir $(DISTDIR)/samples/font
+	cp $(SAMPDIR)/font/Makefile.in $(DISTDIR)/samples/font
+	cp $(SAMPDIR)/font/makefile.unx $(DISTDIR)/samples/font
+	cp $(SAMPDIR)/font/*.cpp $(DISTDIR)/samples/font
+	
 	mkdir $(DISTDIR)/samples/fractal
 	cp $(SAMPDIR)/fractal/Makefile.in $(DISTDIR)/samples/fractal
 	cp $(SAMPDIR)/fractal/makefile.unx $(DISTDIR)/samples/fractal
 	cp $(SAMPDIR)/fractal/*.cpp $(DISTDIR)/samples/fractal
 	
+	mkdir $(DISTDIR)/samples/grid
+	cp $(SAMPDIR)/grid/Makefile.in $(DISTDIR)/samples/grid
+	cp $(SAMPDIR)/grid/makefile.unx $(DISTDIR)/samples/grid
+	cp $(SAMPDIR)/grid/*.cpp $(DISTDIR)/samples/grid
+	
 	mkdir $(DISTDIR)/samples/help
 	mkdir $(DISTDIR)/samples/help/doc
 	cp $(SAMPDIR)/help/Makefile.in $(DISTDIR)/samples/help
@@ -2493,7 +2556,8 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/image/makefile.unx $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image
-	
+	cp $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image
+    
 	mkdir $(DISTDIR)/samples/internat
 	mkdir $(DISTDIR)/samples/internat/de
 	mkdir $(DISTDIR)/samples/internat/fr
@@ -2514,6 +2578,14 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout
 	cp $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout
 	
+	mkdir $(DISTDIR)/samples/life
+	mkdir $(DISTDIR)/samples/life/bitmaps
+	cp $(SAMPDIR)/life/Makefile.in $(DISTDIR)/samples/life
+	cp $(SAMPDIR)/life/makefile.unx $(DISTDIR)/samples/life
+	cp $(SAMPDIR)/life/*.cpp $(DISTDIR)/samples/life
+	cp $(SAMPDIR)/life/*.xpm $(DISTDIR)/samples/life
+	cp $(SAMPDIR)/life/bitmaps/*.xpm $(DISTDIR)/samples/life/bitmaps
+	
 	mkdir $(DISTDIR)/samples/listctrl
 	mkdir $(DISTDIR)/samples/listctrl/bitmaps
 	cp $(SAMPDIR)/listctrl/Makefile.in $(DISTDIR)/samples/listctrl
@@ -2560,26 +2632,39 @@ SAMPLES_DIST:
 	
 	mkdir $(DISTDIR)/samples/nettest
 	cp $(SAMPDIR)/nettest/Makefile.in $(DISTDIR)/samples/nettest
+	cp $(SAMPDIR)/nettest/makefile.unx $(DISTDIR)/samples/nettest
 	cp $(SAMPDIR)/nettest/*.cpp $(DISTDIR)/samples/nettest
 	
 	mkdir $(DISTDIR)/samples/newgrid
 	cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid
+	cp $(SAMPDIR)/newgrid/makefile.unx $(DISTDIR)/samples/newgrid
 	cp $(SAMPDIR)/newgrid/*.cpp $(DISTDIR)/samples/newgrid
 	cp $(SAMPDIR)/newgrid/*.h $(DISTDIR)/samples/newgrid
 	
 	mkdir $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
+	cp $(SAMPDIR)/notebook/makefile.unx $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/*.cpp $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/*.h $(DISTDIR)/samples/notebook
 	
 	mkdir $(DISTDIR)/samples/png
 	cp $(SAMPDIR)/png/Makefile.in $(DISTDIR)/samples/png
+	cp $(SAMPDIR)/png/makefile.unx $(DISTDIR)/samples/png
 	cp $(SAMPDIR)/png/*.cpp $(DISTDIR)/samples/png
 	cp $(SAMPDIR)/png/*.h $(DISTDIR)/samples/png
 	cp $(SAMPDIR)/png/*.png $(DISTDIR)/samples/png
 	
+	mkdir $(DISTDIR)/samples/printing
+	cp $(SAMPDIR)/printing/Makefile.in $(DISTDIR)/samples/printing
+	cp $(SAMPDIR)/printing/makefile.unx $(DISTDIR)/samples/printing
+	cp $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing
+	cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
+	cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
+	cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
+	
 	mkdir $(DISTDIR)/samples/resource
 	cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
+	cp $(SAMPDIR)/resource/makefile.unx $(DISTDIR)/samples/resource
 	cp $(SAMPDIR)/resource/*.cpp $(DISTDIR)/samples/resource
 	cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource
 	cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource
@@ -2591,65 +2676,85 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/richedit/*.xpm $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit
+    
 	mkdir $(DISTDIR)/samples/proplist
 	cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist
 	cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist
 	cp $(SAMPDIR)/proplist/*.h $(DISTDIR)/samples/proplist
+    
 	mkdir $(DISTDIR)/samples/propsize
 	cp $(SAMPDIR)/propsize/Makefile.in $(DISTDIR)/samples/propsize
 	cp $(SAMPDIR)/propsize/*.cpp $(DISTDIR)/samples/propsize
 	cp $(SAMPDIR)/propsize/*.xpm $(DISTDIR)/samples/propsize
+    
 	mkdir $(DISTDIR)/samples/sashtest
 	cp $(SAMPDIR)/sashtest/Makefile.in $(DISTDIR)/samples/sashtest
 	cp $(SAMPDIR)/sashtest/*.cpp $(DISTDIR)/samples/sashtest
 	cp $(SAMPDIR)/sashtest/*.h $(DISTDIR)/samples/sashtest
+    
 	mkdir $(DISTDIR)/samples/scroll
 	cp $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll
+	cp $(SAMPDIR)/scroll/makefile.unx $(DISTDIR)/samples/scroll
 	cp $(SAMPDIR)/scroll/*.cpp $(DISTDIR)/samples/scroll
+    
 	mkdir $(DISTDIR)/samples/scrollsub
 	cp $(SAMPDIR)/scrollsub/Makefile.in $(DISTDIR)/samples/scrollsub
+	cp $(SAMPDIR)/scrollsub/makefile.unx $(DISTDIR)/samples/scrollsub
 	cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub
+    
 	mkdir $(DISTDIR)/samples/splitter
+	cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter
+    
 	mkdir $(DISTDIR)/samples/text
 	cp $(SAMPDIR)/text/Makefile.in $(DISTDIR)/samples/text
+	cp $(SAMPDIR)/text/makefile.unx $(DISTDIR)/samples/text
 	cp $(SAMPDIR)/text/*.cpp $(DISTDIR)/samples/text
 	cp $(SAMPDIR)/text/*.xpm $(DISTDIR)/samples/text
+    
 	mkdir $(DISTDIR)/samples/thread
 	cp $(SAMPDIR)/thread/Makefile.in $(DISTDIR)/samples/thread
+	cp $(SAMPDIR)/thread/makefile.unx $(DISTDIR)/samples/thread
 	cp $(SAMPDIR)/thread/*.cpp $(DISTDIR)/samples/thread
+    
 	mkdir $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/Makefile.in $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/*.cpp $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar
 	mkdir $(DISTDIR)/samples/toolbar/bitmaps
 	cp $(SAMPDIR)/toolbar/bitmaps/*.xpm $(DISTDIR)/samples/toolbar/bitmaps
+    
 	mkdir $(DISTDIR)/samples/treectrl
 	cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl
 	cp $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl
 	cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl
 	cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl
+    
 	mkdir $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/*.cpp $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/*.h $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/*.xpm $(DISTDIR)/samples/typetest
+    
 	mkdir $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/Makefile.in $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/*.cpp $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/*.h $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/*.xpm $(DISTDIR)/samples/validate
+    
 	mkdir $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/Makefile.in $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard
+    
 	mkdir $(DISTDIR)/samples/wxpoem
 	cp $(SAMPDIR)/wxpoem/Makefile.in $(DISTDIR)/samples/wxpoem
 	cp $(SAMPDIR)/wxpoem/*.cpp $(DISTDIR)/samples/wxpoem
 	cp $(SAMPDIR)/wxpoem/*.xpm $(DISTDIR)/samples/wxpoem
 	cp $(SAMPDIR)/wxpoem/*.dat $(DISTDIR)/samples/wxpoem
 	cp $(SAMPDIR)/wxpoem/*.txt $(DISTDIR)/samples/wxpoem
+    
 	mkdir $(DISTDIR)/samples/wxsocket
 	cp $(SAMPDIR)/wxsocket/Makefile.in $(DISTDIR)/samples/wxsocket
 	cp $(SAMPDIR)/wxsocket/*.cpp $(DISTDIR)/samples/wxsocket