X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f85afd4e46af8d5432aefa584bb3e54a8eac5522..b581c7e649a5366ee1953efe82c7d8c7f14637b4:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 52f12c9578..da64a1abcf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 13:22, 1999/10/06
+# This file was automatically generated by tmake at 16:44, 1999/11/05
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -44,8 +44,9 @@ VP6 = @top_srcdir@/src/html
 VP7 = @top_srcdir@/src/png
 VP8 = @top_srcdir@/src/jpeg
 VP9 = @top_srcdir@/src/zlib
+VP10 = @top_srcdir@/src/iodbc
 
-VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9)
+VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10)
 
 top_srcdir = @top_srcdir@
 prefix = @prefix@
@@ -111,6 +112,7 @@ ZLIBDIR  = $(WXDIR)/src/zlib
 GTKDIR   = $(WXDIR)/src/gtk
 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
+ODBCDIR  = $(WXDIR)/src/iodbc
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
 UTILSDIR = $(WXDIR)/utils
@@ -120,11 +122,48 @@ DOCDIR = $(WXDIR)/docs
 
 ########################## Archive name ###############################
 
-WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)-b9.tgz
+WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
 DISTDIR = ./_dist_dir/wx$(TOOLKIT)
 
 ############################## Files ##################################
 
+BASE_HEADERS = \
+		app.h \
+		date.h \
+		debug.h \
+		defs.h \
+		dynarray.h \
+		dynlib.h \
+		event.h \
+		ffile.h \
+		file.h \
+		fileconf.h \
+		hash.h \
+		intl.h \
+		list.h \
+		log.h \
+		longlong.h \
+		mimetype.h \
+		module.h \
+		object.h \
+		process.h \
+		setup.h \
+		strconv.h \
+		stream.h \
+		string.h \
+		textfile.h \
+		thread.h \
+		time.h \
+		timer.h \
+		tokenzr.h \
+		txtstrm.h \
+		utils.h \
+		variant.h \
+		version.h \
+		wx.h \
+		wxchar.h \
+		wxprec.h
+
 WX_HEADERS = \
 		accel.h \
 		app.h \
@@ -148,6 +187,7 @@ WX_HEADERS = \
 		confbase.h \
 		config.h \
 		control.h \
+		ctrlsub.h \
 		cursor.h \
 		dataobj.h \
 		date.h \
@@ -164,6 +204,7 @@ WX_HEADERS = \
 		debug.h \
 		defs.h \
 		dialog.h \
+		dialup.h \
 		dirdlg.h \
 		dnd.h \
 		docmdi.h \
@@ -181,6 +222,9 @@ WX_HEADERS = \
 		filesys.h \
 		font.h \
 		fontdlg.h \
+		fontenum.h \
+		fontmap.h \
+		fontutil.h \
 		frame.h \
 		fs_inet.h \
 		fs_zip.h \
@@ -257,6 +301,7 @@ WX_HEADERS = \
 		slider.h \
 		socket.h \
 		spinbutt.h \
+		spinctrl.h \
 		splitter.h \
 		statbmp.h \
 		statbox.h \
@@ -323,7 +368,9 @@ GTK_HEADERS = \
 		gtk/combobox.h \
 		gtk/control.h \
 		gtk/cursor.h \
+		gtk/dataform.h \
 		gtk/dataobj.h \
+		gtk/dataobj2.h \
 		gtk/dc.h \
 		gtk/dcclient.h \
 		gtk/dcmemory.h \
@@ -353,6 +400,7 @@ GTK_HEADERS = \
 		gtk/settings.h \
 		gtk/slider.h \
 		gtk/spinbutt.h \
+		gtk/spinctrl.h \
 		gtk/statbmp.h \
 		gtk/statbox.h \
 		gtk/statline.h \
@@ -382,7 +430,9 @@ MOTIF_HEADERS = \
 		motif/combobox.h \
 		motif/control.h \
 		motif/cursor.h \
+		motif/dataform.h \
 		motif/dataobj.h \
+		motif/dataobj2.h \
 		motif/dc.h \
 		motif/dcclient.h \
 		motif/dcmemory.h \
@@ -527,6 +577,7 @@ GENERIC_HEADERS = \
 		generic/filedlgg.h \
 		generic/fontdlgg.h \
 		generic/grid.h \
+		generic/gridg.h \
 		generic/helpext.h \
 		generic/helphtml.h \
 		generic/helpwxht.h \
@@ -565,8 +616,8 @@ HTML_HEADERS = \
 		html/htmlpars.h \
 		html/htmltag.h \
 		html/htmlwin.h \
+		html/htmprint.h \
 		html/m_templ.h \
-		html/version.h \
 		html/winpars.h
 
 GTK_GENERICOBJS = \
@@ -578,6 +629,7 @@ GTK_GENERICOBJS = \
 		dirdlgg.o \
 		filedlgg.o \
 		grid.o \
+		helpext.o \
 		helphtml.o \
 		helpwxht.o \
 		imaglist.o \
@@ -597,6 +649,7 @@ GTK_GENERICOBJS = \
 		scrolwin.o \
 		splitter.o \
 		statusbr.o \
+		tabg.o \
 		textdlgg.o \
 		tipdlg.o \
 		treectrl.o \
@@ -611,6 +664,7 @@ GTK_GENERICDEPS = \
 		dirdlgg.d \
 		filedlgg.d \
 		grid.d \
+		helpext.d \
 		helphtml.d \
 		helpwxht.d \
 		imaglist.d \
@@ -630,6 +684,7 @@ GTK_GENERICDEPS = \
 		scrolwin.d \
 		splitter.d \
 		statusbr.d \
+		tabg.d \
 		textdlgg.d \
 		tipdlg.d \
 		treectrl.d \
@@ -637,14 +692,20 @@ GTK_GENERICDEPS = \
 
 GTK_COMMONOBJS = \
 		parser.o \
+		appcmn.o \
+		choiccmn.o \
+		clipcmn.o \
 		cmndata.o \
 		config.o \
+		ctrlcmn.o \
+		ctrlsub.o \
 		date.o \
 		datstrm.o \
 		db.o \
 		dbtable.o \
 		dcbase.o \
 		dlgcmn.o \
+		dobjcmn.o \
 		docmdi.o \
 		docview.o \
 		dynarray.o \
@@ -657,6 +718,7 @@ GTK_COMMONOBJS = \
 		filefn.o \
 		filesys.o \
 		fontcmn.o \
+		fontmap.o \
 		framecmn.o \
 		fs_inet.o \
 		fs_zip.o \
@@ -677,9 +739,11 @@ GTK_COMMONOBJS = \
 		intl.o \
 		ipcbase.o \
 		layout.o \
+		lboxcmn.o \
 		list.o \
 		log.o \
 		memory.o \
+		menucmn.o \
 		mimetype.o \
 		module.o \
 		mstream.o \
@@ -724,14 +788,20 @@ GTK_COMMONOBJS = \
 
 GTK_COMMONDEPS = \
 		parser.d \
+		appcmn.d \
+		choiccmn.d \
+		clipcmn.d \
 		cmndata.d \
 		config.d \
+		ctrlcmn.d \
+		ctrlsub.d \
 		date.d \
 		datstrm.d \
 		db.d \
 		dbtable.d \
 		dcbase.d \
 		dlgcmn.d \
+		dobjcmn.d \
 		docmdi.d \
 		docview.d \
 		dynarray.d \
@@ -744,6 +814,7 @@ GTK_COMMONDEPS = \
 		filefn.d \
 		filesys.d \
 		fontcmn.d \
+		fontmap.d \
 		framecmn.d \
 		fs_inet.d \
 		fs_zip.d \
@@ -764,9 +835,11 @@ GTK_COMMONDEPS = \
 		intl.d \
 		ipcbase.d \
 		layout.d \
+		lboxcmn.d \
 		list.d \
 		log.d \
 		memory.d \
+		menucmn.d \
 		mimetype.d \
 		module.d \
 		mstream.d \
@@ -854,6 +927,7 @@ GTK_GUIOBJS = \
 		settings.o \
 		slider.o \
 		spinbutt.o \
+		spinctrl.o \
 		statbmp.o \
 		statbox.o \
 		statline.o \
@@ -913,6 +987,7 @@ GTK_GUIDEPS = \
 		settings.d \
 		slider.d \
 		spinbutt.d \
+		spinctrl.d \
 		statbmp.d \
 		statbox.d \
 		statline.d \
@@ -936,6 +1011,7 @@ MOTIF_GENERICOBJS = \
 		dirdlgg.o \
 		fontdlgg.o \
 		grid.o \
+		helpext.o \
 		helphtml.o \
 		helpwxht.o \
 		helpxlp.o \
@@ -973,6 +1049,7 @@ MOTIF_GENERICDEPS = \
 		dirdlgg.d \
 		fontdlgg.d \
 		grid.d \
+		helpext.d \
 		helphtml.d \
 		helpwxht.d \
 		helpxlp.d \
@@ -1003,16 +1080,20 @@ MOTIF_GENERICDEPS = \
 
 MOTIF_COMMONOBJS = \
 		parser.o \
+		appcmn.o \
 		choiccmn.o \
+		clipcmn.o \
 		cmndata.o \
 		config.o \
 		ctrlcmn.o \
+		ctrlsub.o \
 		date.o \
 		datstrm.o \
 		db.o \
 		dbtable.o \
 		dcbase.o \
 		dlgcmn.o \
+		dobjcmn.o \
 		docmdi.o \
 		docview.o \
 		dynarray.o \
@@ -1025,6 +1106,7 @@ MOTIF_COMMONOBJS = \
 		filefn.o \
 		filesys.o \
 		fontcmn.o \
+		fontmap.o \
 		framecmn.o \
 		fs_inet.o \
 		fs_zip.o \
@@ -1045,15 +1127,16 @@ MOTIF_COMMONOBJS = \
 		intl.o \
 		ipcbase.o \
 		layout.o \
+		lboxcmn.o \
 		list.o \
 		log.o \
 		memory.o \
+		menucmn.o \
 		mimetype.o \
 		module.o \
 		mstream.o \
 		object.o \
 		objstrm.o \
-		odbc.o \
 		paper.o \
 		prntbase.o \
 		process.o \
@@ -1093,16 +1176,20 @@ MOTIF_COMMONOBJS = \
 
 MOTIF_COMMONDEPS = \
 		parser.d \
+		appcmn.d \
 		choiccmn.d \
+		clipcmn.d \
 		cmndata.d \
 		config.d \
 		ctrlcmn.d \
+		ctrlsub.d \
 		date.d \
 		datstrm.d \
 		db.d \
 		dbtable.d \
 		dcbase.d \
 		dlgcmn.d \
+		dobjcmn.d \
 		docmdi.d \
 		docview.d \
 		dynarray.d \
@@ -1115,6 +1202,7 @@ MOTIF_COMMONDEPS = \
 		filefn.d \
 		filesys.d \
 		fontcmn.d \
+		fontmap.d \
 		framecmn.d \
 		fs_inet.d \
 		fs_zip.d \
@@ -1135,15 +1223,16 @@ MOTIF_COMMONDEPS = \
 		intl.d \
 		ipcbase.d \
 		layout.d \
+		lboxcmn.d \
 		list.d \
 		log.d \
 		memory.d \
+		menucmn.d \
 		mimetype.d \
 		module.d \
 		mstream.d \
 		object.d \
 		objstrm.d \
-		odbc.d \
 		paper.d \
 		prntbase.d \
 		process.d \
@@ -1206,7 +1295,6 @@ MOTIF_GUIOBJS = \
 		dialog.o \
 		filedlg.o \
 		font.o \
-		fontenum.o \
 		frame.o \
 		gauge.o \
 		gdiobj.o \
@@ -1262,7 +1350,6 @@ MOTIF_GUIDEPS = \
 		dialog.d \
 		filedlg.d \
 		font.d \
-		fontenum.d \
 		frame.d \
 		gauge.d \
 		gdiobj.d \
@@ -1339,16 +1426,20 @@ MSW_GENERICDEPS = \
 
 MSW_COMMONOBJS = \
 		parser.o \
+		appcmn.o \
 		choiccmn.o \
+		clipcmn.o \
 		cmndata.o \
 		config.o \
 		ctrlcmn.o \
+		ctrlsub.o \
 		date.o \
 		datstrm.o \
 		db.o \
 		dbtable.o \
 		dcbase.o \
 		dlgcmn.o \
+		dobjcmn.o \
 		docmdi.o \
 		docview.o \
 		dynarray.o \
@@ -1361,6 +1452,7 @@ MSW_COMMONOBJS = \
 		filefn.o \
 		filesys.o \
 		fontcmn.o \
+		fontmap.o \
 		framecmn.o \
 		fs_inet.o \
 		fs_zip.o \
@@ -1381,14 +1473,17 @@ MSW_COMMONOBJS = \
 		intl.o \
 		ipcbase.o \
 		layout.o \
+		lboxcmn.o \
 		list.o \
 		log.o \
 		memory.o \
+		menucmn.o \
 		mimetype.o \
 		module.o \
 		mstream.o \
 		object.o \
 		objstrm.o \
+		odbc.o \
 		paper.o \
 		prntbase.o \
 		process.o \
@@ -1428,16 +1523,20 @@ MSW_COMMONOBJS = \
 
 MSW_COMMONDEPS = \
 		parser.d \
+		appcmn.d \
 		choiccmn.d \
+		clipcmn.d \
 		cmndata.d \
 		config.d \
 		ctrlcmn.d \
+		ctrlsub.d \
 		date.d \
 		datstrm.d \
 		db.d \
 		dbtable.d \
 		dcbase.d \
 		dlgcmn.d \
+		dobjcmn.d \
 		docmdi.d \
 		docview.d \
 		dynarray.d \
@@ -1450,6 +1549,7 @@ MSW_COMMONDEPS = \
 		filefn.d \
 		filesys.d \
 		fontcmn.d \
+		fontmap.d \
 		framecmn.d \
 		fs_inet.d \
 		fs_zip.d \
@@ -1470,14 +1570,17 @@ MSW_COMMONDEPS = \
 		intl.d \
 		ipcbase.d \
 		layout.d \
+		lboxcmn.d \
 		list.d \
 		log.d \
 		memory.d \
+		menucmn.d \
 		mimetype.d \
 		module.d \
 		mstream.d \
 		object.d \
 		objstrm.d \
+		odbc.d \
 		paper.d \
 		prntbase.d \
 		process.d \
@@ -1547,6 +1650,7 @@ MSW_GUIOBJS = \
 		filedlg.o \
 		font.o \
 		fontdlg.o \
+		fontutil.o \
 		frame.o \
 		gauge95.o \
 		gdiobj.o \
@@ -1582,6 +1686,7 @@ MSW_GUIOBJS = \
 		settings.o \
 		slider95.o \
 		spinbutt.o \
+		spinctrl.o \
 		statbmp.o \
 		statbox.o \
 		statbr95.o \
@@ -1633,6 +1738,7 @@ MSW_GUIDEPS = \
 		filedlg.d \
 		font.d \
 		fontdlg.d \
+		fontutil.d \
 		frame.d \
 		gauge95.d \
 		gdiobj.d \
@@ -1668,6 +1774,7 @@ MSW_GUIDEPS = \
 		settings.d \
 		slider95.d \
 		spinbutt.d \
+		spinctrl.d \
 		statbmp.d \
 		statbox.d \
 		statbr95.d \
@@ -1687,6 +1794,76 @@ MSW_GUIDEPS = \
 		window.d \
 		xpmhand.d
 
+BASE_OBJS = \
+		init.o \
+		appcmn.o \
+		config.o \
+		date.o \
+		dynarray.o \
+		dynlib.o \
+		event.o \
+		extended.o \
+		ffile.o \
+		file.o \
+		fileconf.o \
+		filefn.o \
+		filesys.o \
+		hash.o \
+		intl.o \
+		list.o \
+		log.o \
+		mimetype.o \
+		module.o \
+		object.o \
+		process.o \
+		strconv.o \
+		stream.o \
+		string.o \
+		textfile.o \
+		time.o \
+		timercmn.o \
+		tokenzr.o \
+		txtstrm.o \
+		utilscmn.o \
+		variant.o \
+		wxchar.o \
+		utilsunx.o
+
+BASE_DEPS = \
+		init.d \
+		appcmn.d \
+		config.d \
+		date.d \
+		dynarray.d \
+		dynlib.d \
+		event.d \
+		extended.d \
+		ffile.d \
+		file.d \
+		fileconf.d \
+		filefn.d \
+		filesys.d \
+		hash.d \
+		intl.d \
+		list.d \
+		log.d \
+		mimetype.d \
+		module.d \
+		object.d \
+		process.d \
+		strconv.d \
+		stream.d \
+		string.d \
+		textfile.d \
+		time.d \
+		timercmn.d \
+		tokenzr.d \
+		txtstrm.d \
+		utilscmn.d \
+		variant.d \
+		wxchar.d \
+		utilsunx.d
+
 HTMLOBJS = \
 		helpctrl.o \
 		helpdata.o \
@@ -1696,6 +1873,7 @@ HTMLOBJS = \
 		htmlpars.o \
 		htmltag.o \
 		htmlwin.o \
+		htmprint.o \
 		m_fonts.o \
 		m_hline.o \
 		m_image.o \
@@ -1704,7 +1882,6 @@ HTMLOBJS = \
 		m_list.o \
 		m_pre.o \
 		m_tables.o \
-		search.o \
 		winpars.o
 
 HTMLDEPS = \
@@ -1716,6 +1893,7 @@ HTMLDEPS = \
 		htmlpars.d \
 		htmltag.d \
 		htmlwin.d \
+		htmprint.d \
 		m_fonts.d \
 		m_hline.d \
 		m_image.d \
@@ -1724,17 +1902,20 @@ HTMLDEPS = \
 		m_list.d \
 		m_pre.d \
 		m_tables.d \
-		search.d \
 		winpars.d
 
-UNIXOBJS = \
+UNIX_OBJS = \
 		dialup.o \
+		fontenum.o \
+		fontutil.o \
 		gsocket.o \
 		threadpsx.o \
 		utilsunx.o
 
-UNIXDEPS = \
+UNIX_DEPS = \
 		dialup.d \
+		fontenum.d \
+		fontutil.d \
 		gsocket.d \
 		threadpsx.d \
 		utilsunx.d
@@ -1821,16 +2002,41 @@ JPEGOBJS    = \
 		jquant2.o \
 		jdmerge.o
 
-
-OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(@UNIXOBJS@) $(HTMLOBJS) \
-	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS)
-
-DEPFILES = $(@GUIDEPS@) $(@COMMONDEPS@) $(@GENERICDEPS@) $(UNIXDEPS) $(HTMLDEPS)
-
-HEADERS = $(@GUIHEADERS@) $(HTML_HEADERS) $(UNIX_HEADERS) $(PROTOCOL_HEADERS) \
-	  $(GENERIC_HEADERS) $(WX_HEADERS)
-
-all: $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
+IODBC_OBJS = \
+		catalog.o \
+		connect.o \
+		dlf.o \
+		dlproc.o \
+		execute.o \
+		fetch.o \
+		hdbc.o \
+		henv.o \
+		herr.o \
+		hstmt.o \
+		info.o \
+		itrace.o \
+		misc.o \
+		prepare.o \
+		result.o
+
+GUIOBJS = @GUIOBJS@
+GUIDEPS = @GUIDEPS@
+GUIHEADERS = @GUIHEADERS@
+COMMONOBJS = @COMMONOBJS@
+COMMONDEPS = @COMMONDEPS@
+GENERICOBJS = @GENERICOBJS@
+GENERICDEPS = @GENERICDEPS@
+UNIXOBJS = @UNIXOBJS@
+UNIXDEPS = @UNIXDEPS@
+IODBCOBJS = @IODBCOBJS@
+
+OBJECTS = @ALL_OBJECTS@
+
+DEPFILES = @ALL_DEPFILES@
+
+HEADERS = @ALL_HEADERS@
+
+all: @WX_ALL@
 
 @WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
 	@$(INSTALL) -d ./lib
@@ -1841,7 +2047,7 @@ all: $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
 	@$(INSTALL) -d ./lib
 	$(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
 	
-CREATE_LINKS@: @WX_TARGET_LIBRARY@
+CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
 	@$(RM) ./lib/@WX_LIBRARY_LINK1@
 	@$(RM) ./lib/@WX_LIBRARY_LINK2@
 	@$(RM) ./lib/@WX_LIBRARY_LINK3@
@@ -1849,15 +2055,15 @@ CREATE_LINKS@: @WX_TARGET_LIBRARY@
 	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
 	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
 	
-CREATE_INSTALLED_LINKS:  $(libdir)/@WX_TARGET_LIBRARY@
+CREATE_INSTALLED_LINKS:  $(libdir)/@WX_LIBRARY_NAME_SHARED@
 	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
 	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
 	$(RM) $(libdir)/@WX_LIBRARY_LINK3@
-	$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK1@
-	$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK2@
-	$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK3@
+	$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@
+	$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@
+	$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@
 	
-$(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
+$(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
 
 parser.o:    parser.c lexer.c
 	$(CCLEX) -c $(CFLAGS) $(PICFLAGS) -o $@ parser.c
@@ -1882,7 +2088,7 @@ lexer.c:	$(COMMDIR)/lexer.l
 
 -include $(DEPFILES)
 
-preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(top_builddir)/setup.h
+preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
 	@echo " "
 	@echo " Installing wxWindows..."
 	@echo " "
@@ -1899,7 +2105,7 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
 	$(INSTALL) -d $(libdir)/wx/include
 	$(INSTALL) -d $(libdir)/wx/include/wx
 	$(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
-	$(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
+	$(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
@@ -1923,8 +2129,8 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
 write_message:
 	@echo " "
 	@echo " The installation of wxWindows is finished.  On certain"
-	@echo " platforms (e.g. Linux, Solaris) you'll now have to run"
-	@echo " ldconfig if you installed a shared library."
+	@echo " platforms (e.g. Linux) you'll now have to run ldconfig"
+	@echo " if you installed a shared library."
 	@echo " "
 	@echo " wxWindows comes with  no guarantees  and doesn't claim"
 	@echo " to be suitable for any purpose."
@@ -1932,7 +2138,7 @@ write_message:
 	@echo " Read the wxWindows Licence on licencing conditions."
 	@echo " "
 
-install: preinstall @WX_CREATE_INSTALLED_LINKS@ write_message
+install: preinstall @WX_ALL_INSTALLED@ write_message
 
 uninstall:
 	@echo " "
@@ -1973,6 +2179,7 @@ ALL_DIST:
 	mkdir _dist_dir
 	mkdir $(DISTDIR)
 	cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR)
+	cp $(WXDIR)/configure.in $(DISTDIR)
 	cp $(WXDIR)/configure $(DISTDIR)
 	cp $(WXDIR)/config.sub $(DISTDIR)
 	cp $(WXDIR)/config.guess $(DISTDIR)
@@ -2012,6 +2219,7 @@ ALL_DIST:
 	mkdir $(DISTDIR)/src/png
 	mkdir $(DISTDIR)/src/jpeg
 	mkdir $(DISTDIR)/src/zlib
+	mkdir $(DISTDIR)/src/iodbc
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
 	cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
 	cp $(COMMDIR)/*.c $(DISTDIR)/src/common
@@ -2021,9 +2229,7 @@ ALL_DIST:
 	cp $(COMMDIR)/*.y $(DISTDIR)/src/common
 	cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic
 	cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
-	cp $(HTMLDIR)/*.h $(DISTDIR)/src/html
 	cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps
-	cp $(UNIXDIR)/*.h $(DISTDIR)/src/unix
 	cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix
 	cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
 	cp $(PNGDIR)/*.h $(DISTDIR)/src/png
@@ -2035,6 +2241,13 @@ ALL_DIST:
 	cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
 	cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
 	cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
+	cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
+	cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc
+	cp $(ODBCDIR)/*.ci $(DISTDIR)/src/iodbc
+	cp $(ODBCDIR)/*.exp $(DISTDIR)/src/iodbc
+	cp $(ODBCDIR)/README $(DISTDIR)/src/iodbc
+	cp $(ODBCDIR)/NEWS $(DISTDIR)/src/iodbc
+	cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc
 
 GTK_DIST:
 	cp $(WXDIR)/wxGTK.spec $(DISTDIR)
@@ -2099,6 +2312,11 @@ SAMPLES_DIST:
 	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/*.cpp $(DISTDIR)/samples/db
+	cp $(SAMPDIR)/db/*.h $(DISTDIR)/samples/db
+	cp $(SAMPDIR)/db/*.xpm $(DISTDIR)/samples/db
 	mkdir $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
@@ -2127,6 +2345,14 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/dynamic/Makefile.in $(DISTDIR)/samples/dynamic
 	cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic
 	cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic
+	mkdir $(DISTDIR)/samples/forty
+	cp $(SAMPDIR)/forty/Makefile.in $(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/fractal
+	cp $(SAMPDIR)/fractal/Makefile.in $(DISTDIR)/samples/fractal
+	cp $(SAMPDIR)/fractal/*.cpp $(DISTDIR)/samples/fractal
 	mkdir $(DISTDIR)/samples/html
 	cp $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html
 	mkdir $(DISTDIR)/samples/html/about
@@ -2140,12 +2366,13 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/html/help/*.cpp $(DISTDIR)/samples/html/help
 	mkdir $(DISTDIR)/samples/html/help/helpfiles
 	cp $(SAMPDIR)/html/help/helpfiles/*.??? $(DISTDIR)/samples/html/help/helpfiles
+	mkdir $(DISTDIR)/samples/html/helpview
+	cp $(SAMPDIR)/html/helpview/Makefile.in $(DISTDIR)/samples/html/helpview
+	cp $(SAMPDIR)/html/helpview/*.cpp $(DISTDIR)/samples/html/helpview
+	cp $(SAMPDIR)/html/helpview/*.zip $(DISTDIR)/samples/html/helpview
 	mkdir $(DISTDIR)/samples/html/printing
 	cp $(SAMPDIR)/html/printing/Makefile.in $(DISTDIR)/samples/html/printing
-	cp $(SAMPDIR)/html/printing/*.xpm $(DISTDIR)/samples/html/printing
 	cp $(SAMPDIR)/html/printing/*.cpp $(DISTDIR)/samples/html/printing
-	cp $(SAMPDIR)/html/printing/*.h $(DISTDIR)/samples/html/printing
-	cp $(SAMPDIR)/html/printing/*.png $(DISTDIR)/samples/html/printing
 	cp $(SAMPDIR)/html/printing/*.htm $(DISTDIR)/samples/html/printing
 	mkdir $(DISTDIR)/samples/html/test
 	cp $(SAMPDIR)/html/test/Makefile.in $(DISTDIR)/samples/html/test
@@ -2171,6 +2398,18 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/image/Makefile.in $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image
+	mkdir $(DISTDIR)/samples/internat
+	mkdir $(DISTDIR)/samples/internat/de
+	mkdir $(DISTDIR)/samples/internat/fr
+	cp $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat
+	cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat
+	cp $(SAMPDIR)/internat/*.xpm $(DISTDIR)/samples/internat
+	cp $(SAMPDIR)/internat/*.txt $(DISTDIR)/samples/internat
+	cp $(SAMPDIR)/internat/*.po $(DISTDIR)/samples/internat
+	cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
+	cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
+	cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
+	cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
 	mkdir $(DISTDIR)/samples/layout
 	cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout
 	cp $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout
@@ -2180,24 +2419,29 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/listctrl/*.cpp $(DISTDIR)/samples/listctrl
 	cp $(SAMPDIR)/listctrl/*.h $(DISTDIR)/samples/listctrl
 	cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl
-	mkdir $(DISTDIR)/samples/listctrl/bitmap
-	cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl/bitmaps
+	mkdir $(DISTDIR)/samples/listctrl/bitmaps
+	cp $(SAMPDIR)/listctrl/bitmaps/*.xpm $(DISTDIR)/samples/listctrl/bitmaps
 	mkdir $(DISTDIR)/samples/mdi
 	cp $(SAMPDIR)/mdi/Makefile.in $(DISTDIR)/samples/mdi
 	cp $(SAMPDIR)/mdi/*.cpp $(DISTDIR)/samples/mdi
 	cp $(SAMPDIR)/mdi/*.h $(DISTDIR)/samples/mdi
 	cp $(SAMPDIR)/mdi/*.xpm $(DISTDIR)/samples/mdi
+	mkdir $(DISTDIR)/samples/mdi/bitmaps
+	cp $(SAMPDIR)/mdi/bitmaps/*.xpm $(DISTDIR)/samples/mdi/bitmaps
 	mkdir $(DISTDIR)/samples/minifram
 	cp $(SAMPDIR)/minifram/Makefile.in $(DISTDIR)/samples/minifram
 	cp $(SAMPDIR)/minifram/*.cpp $(DISTDIR)/samples/minifram
 	cp $(SAMPDIR)/minifram/*.h $(DISTDIR)/samples/minifram
 	cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram
-	mkdir $(DISTDIR)/samples/minifram/bitmap
-	cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram/bitmaps
+	mkdir $(DISTDIR)/samples/minifram/bitmaps
+	cp $(SAMPDIR)/minifram/bitmaps/*.xpm $(DISTDIR)/samples/minifram/bitmaps
 	mkdir $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
+	mkdir $(DISTDIR)/samples/nettest
+	cp $(SAMPDIR)/nettest/Makefile.in $(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/*.cpp $(DISTDIR)/samples/newgrid
@@ -2206,6 +2450,23 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/notebook/Makefile.in $(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/*.cpp $(DISTDIR)/samples/png
+	cp $(SAMPDIR)/png/*.h $(DISTDIR)/samples/png
+	cp $(SAMPDIR)/png/*.png $(DISTDIR)/samples/png
+	mkdir $(DISTDIR)/samples/resource
+	cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
+	cp $(SAMPDIR)/resource/*.cpp $(DISTDIR)/samples/resource
+	cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource
+	cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource
+	mkdir $(DISTDIR)/samples/richedit
+	cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
+	cp $(SAMPDIR)/richedit/*.cpp $(DISTDIR)/samples/richedit
+	cp $(SAMPDIR)/richedit/*.h $(DISTDIR)/samples/richedit
+	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
@@ -2217,6 +2478,9 @@ SAMPLES_DIST:
 	mkdir $(DISTDIR)/samples/scroll
 	cp $(SAMPDIR)/scroll/Makefile.in $(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/*.cpp $(DISTDIR)/samples/scrollsub
 	mkdir $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter
@@ -2230,10 +2494,9 @@ SAMPLES_DIST:
 	mkdir $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/Makefile.in $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/*.cpp $(DISTDIR)/samples/toolbar
-	cp $(SAMPDIR)/toolbar/*.h $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar
-	mkdir $(DISTDIR)/samples/toolbar/bitmap
-	cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar/bitmaps
+	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
@@ -2267,24 +2530,33 @@ SAMPLES_DIST:
 UTILS_DIST:
 	mkdir $(DISTDIR)/utils
 	cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
+	
 	mkdir $(DISTDIR)/utils/wxMMedia2
-	cp $(UTILSDIR)/wxMMedia2/Makefile.in $(DISTDIR)/utils/wxMMedia2
 	mkdir $(DISTDIR)/utils/wxMMedia2/lib
+	mkdir $(DISTDIR)/utils/wxMMedia2/sample
+	cp $(UTILSDIR)/wxMMedia2/Makefile.in $(DISTDIR)/utils/wxMMedia2
 	cp $(UTILSDIR)/wxMMedia2/lib/Makefile.in $(DISTDIR)/utils/wxMMedia2/lib
 	cp $(UTILSDIR)/wxMMedia2/lib/*.h $(DISTDIR)/utils/wxMMedia2/lib
 	cp $(UTILSDIR)/wxMMedia2/lib/*.cpp $(DISTDIR)/utils/wxMMedia2/lib
 	cp $(UTILSDIR)/wxMMedia2/lib/*.def $(DISTDIR)/utils/wxMMedia2/lib
-	mkdir $(DISTDIR)/utils/wxMMedia2/sample
 	cp $(UTILSDIR)/wxMMedia2/sample/Makefile.in $(DISTDIR)/utils/wxMMedia2/sample
 	cp $(UTILSDIR)/wxMMedia2/sample/*.cpp $(DISTDIR)/utils/wxMMedia2/sample
+	
 	mkdir $(DISTDIR)/utils/glcanvas
+	mkdir $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
 	cp $(UTILSDIR)/glcanvas/Makefile.in $(DISTDIR)/utils/glcanvas
 	cp $(UTILSDIR)/glcanvas/docs/notes.txt $(DISTDIR)/utils/glcanvas/NOTES.txt
-	mkdir $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
 	cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/Makefile.in $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
 	cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.h $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
 	cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.cpp $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
 	
+	mkdir $(DISTDIR)/utils/ogl
+	mkdir $(DISTDIR)/utils/ogl/src
+	cp $(UTILSDIR)/ogl/Makefile.in $(DISTDIR)/utils/ogl
+	cp $(UTILSDIR)/ogl/src/Makefile.in $(DISTDIR)/utils/ogl/src
+	cp $(UTILSDIR)/ogl/src/*.h $(DISTDIR)/utils/ogl/src
+	cp $(UTILSDIR)/ogl/src/*.cpp $(DISTDIR)/utils/ogl/src
+	
 MISC_DIST:
 	mkdir $(DISTDIR)/misc
 	mkdir $(DISTDIR)/misc/afm