X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd85fc6b89333821b22ae76808914d8e1d508095..2b835535a92d6c281084c10e46d51029c1eb776d:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index b3705be048..2d7560d84a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 17:51, 1999/09/20
+# This file was automatically generated by tmake at 14:54, 1999/10/14
 # 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 \
@@ -257,6 +296,7 @@ WX_HEADERS = \
 		slider.h \
 		socket.h \
 		spinbutt.h \
+		spinctrl.h \
 		splitter.h \
 		statbmp.h \
 		statbox.h \
@@ -353,6 +393,7 @@ GTK_HEADERS = \
 		gtk/settings.h \
 		gtk/slider.h \
 		gtk/spinbutt.h \
+		gtk/spinctrl.h \
 		gtk/statbmp.h \
 		gtk/statbox.h \
 		gtk/statline.h \
@@ -526,6 +567,7 @@ GENERIC_HEADERS = \
 		generic/dirdlgg.h \
 		generic/filedlgg.h \
 		generic/fontdlgg.h \
+		generic/grid.h \
 		generic/gridg.h \
 		generic/helpext.h \
 		generic/helphtml.h \
@@ -555,19 +597,18 @@ PROTOCOL_HEADERS = \
 		protocol/protocol.h
 
 HTML_HEADERS = \
-		html/forcelink.h \
+		html/forcelnk.h \
 		html/helpctrl.h \
 		html/helpdata.h \
 		html/helpfrm.h \
 		html/htmlcell.h \
 		html/htmldefs.h \
-		html/htmlfilter.h \
-		html/htmlparser.h \
+		html/htmlfilt.h \
+		html/htmlpars.h \
 		html/htmltag.h \
 		html/htmlwin.h \
-		html/htmlwinparser.h \
-		html/mod_templ.h \
-		html/version.h
+		html/m_templ.h \
+		html/winpars.h
 
 GTK_GENERICOBJS = \
 		busyinfo.o \
@@ -577,7 +618,7 @@ GTK_GENERICOBJS = \
 		dcpsg.o \
 		dirdlgg.o \
 		filedlgg.o \
-		gridg.o \
+		grid.o \
 		helphtml.o \
 		helpwxht.o \
 		imaglist.o \
@@ -610,7 +651,7 @@ GTK_GENERICDEPS = \
 		dcpsg.d \
 		dirdlgg.d \
 		filedlgg.d \
-		gridg.d \
+		grid.d \
 		helphtml.d \
 		helpwxht.d \
 		imaglist.d \
@@ -656,6 +697,7 @@ GTK_COMMONOBJS = \
 		fileconf.o \
 		filefn.o \
 		filesys.o \
+		fontcmn.o \
 		framecmn.o \
 		fs_inet.o \
 		fs_zip.o \
@@ -665,6 +707,7 @@ GTK_COMMONOBJS = \
 		hash.o \
 		helpbase.o \
 		http.o \
+		imagall.o \
 		imagbmp.o \
 		image.o \
 		imaggif.o \
@@ -741,6 +784,7 @@ GTK_COMMONDEPS = \
 		fileconf.d \
 		filefn.d \
 		filesys.d \
+		fontcmn.d \
 		framecmn.d \
 		fs_inet.d \
 		fs_zip.d \
@@ -750,6 +794,7 @@ GTK_COMMONDEPS = \
 		hash.d \
 		helpbase.d \
 		http.d \
+		imagall.d \
 		imagbmp.d \
 		image.d \
 		imaggif.d \
@@ -850,6 +895,7 @@ GTK_GUIOBJS = \
 		settings.o \
 		slider.o \
 		spinbutt.o \
+		spinctrl.o \
 		statbmp.o \
 		statbox.o \
 		statline.o \
@@ -909,6 +955,7 @@ GTK_GUIDEPS = \
 		settings.d \
 		slider.d \
 		spinbutt.d \
+		spinctrl.d \
 		statbmp.d \
 		statbox.d \
 		statline.d \
@@ -931,7 +978,7 @@ MOTIF_GENERICOBJS = \
 		dcpsg.o \
 		dirdlgg.o \
 		fontdlgg.o \
-		gridg.o \
+		grid.o \
 		helphtml.o \
 		helpwxht.o \
 		helpxlp.o \
@@ -968,7 +1015,7 @@ MOTIF_GENERICDEPS = \
 		dcpsg.d \
 		dirdlgg.d \
 		fontdlgg.d \
-		gridg.d \
+		grid.d \
 		helphtml.d \
 		helpwxht.d \
 		helpxlp.d \
@@ -1020,6 +1067,7 @@ MOTIF_COMMONOBJS = \
 		fileconf.o \
 		filefn.o \
 		filesys.o \
+		fontcmn.o \
 		framecmn.o \
 		fs_inet.o \
 		fs_zip.o \
@@ -1029,6 +1077,7 @@ MOTIF_COMMONOBJS = \
 		hash.o \
 		helpbase.o \
 		http.o \
+		imagall.o \
 		imagbmp.o \
 		image.o \
 		imaggif.o \
@@ -1108,6 +1157,7 @@ MOTIF_COMMONDEPS = \
 		fileconf.d \
 		filefn.d \
 		filesys.d \
+		fontcmn.d \
 		framecmn.d \
 		fs_inet.d \
 		fs_zip.d \
@@ -1117,6 +1167,7 @@ MOTIF_COMMONDEPS = \
 		hash.d \
 		helpbase.d \
 		http.d \
+		imagall.d \
 		imagbmp.d \
 		image.d \
 		imaggif.d \
@@ -1198,6 +1249,7 @@ MOTIF_GUIOBJS = \
 		dialog.o \
 		filedlg.o \
 		font.o \
+		fontenum.o \
 		frame.o \
 		gauge.o \
 		gdiobj.o \
@@ -1253,6 +1305,7 @@ MOTIF_GUIDEPS = \
 		dialog.d \
 		filedlg.d \
 		font.d \
+		fontenum.d \
 		frame.d \
 		gauge.d \
 		gdiobj.d \
@@ -1287,7 +1340,7 @@ MSW_GENERICOBJS = \
 		busyinfo.o \
 		choicdgg.o \
 		dirdlgg.o \
-		gridg.o \
+		grid.o \
 		laywin.o \
 		logg.o \
 		numdlgg.o \
@@ -1309,7 +1362,7 @@ MSW_GENERICDEPS = \
 		busyinfo.d \
 		choicdgg.d \
 		dirdlgg.d \
-		gridg.d \
+		grid.d \
 		laywin.d \
 		logg.d \
 		numdlgg.d \
@@ -1350,6 +1403,7 @@ MSW_COMMONOBJS = \
 		fileconf.o \
 		filefn.o \
 		filesys.o \
+		fontcmn.o \
 		framecmn.o \
 		fs_inet.o \
 		fs_zip.o \
@@ -1359,6 +1413,7 @@ MSW_COMMONOBJS = \
 		hash.o \
 		helpbase.o \
 		http.o \
+		imagall.o \
 		imagbmp.o \
 		image.o \
 		imaggif.o \
@@ -1377,6 +1432,7 @@ MSW_COMMONOBJS = \
 		mstream.o \
 		object.o \
 		objstrm.o \
+		odbc.o \
 		paper.o \
 		prntbase.o \
 		process.o \
@@ -1437,6 +1493,7 @@ MSW_COMMONDEPS = \
 		fileconf.d \
 		filefn.d \
 		filesys.d \
+		fontcmn.d \
 		framecmn.d \
 		fs_inet.d \
 		fs_zip.d \
@@ -1446,6 +1503,7 @@ MSW_COMMONDEPS = \
 		hash.d \
 		helpbase.d \
 		http.d \
+		imagall.d \
 		imagbmp.d \
 		image.d \
 		imaggif.d \
@@ -1464,6 +1522,7 @@ MSW_COMMONDEPS = \
 		mstream.d \
 		object.d \
 		objstrm.d \
+		odbc.d \
 		paper.d \
 		prntbase.d \
 		process.d \
@@ -1568,6 +1627,7 @@ MSW_GUIOBJS = \
 		settings.o \
 		slider95.o \
 		spinbutt.o \
+		spinctrl.o \
 		statbmp.o \
 		statbox.o \
 		statbr95.o \
@@ -1654,6 +1714,7 @@ MSW_GUIDEPS = \
 		settings.d \
 		slider95.d \
 		spinbutt.d \
+		spinctrl.d \
 		statbmp.d \
 		statbox.d \
 		statbr95.d \
@@ -1673,52 +1734,122 @@ MSW_GUIDEPS = \
 		window.d \
 		xpmhand.d
 
+BASE_OBJS = \
+		init.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 \
+		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 \
 		helpfrm.o \
 		htmlcell.o \
-		htmlfilter.o \
-		htmlparser.o \
+		htmlfilt.o \
+		htmlpars.o \
 		htmltag.o \
 		htmlwin.o \
-		htmlwinparser.o \
-		mod_fonts.o \
-		mod_hline.o \
-		mod_image.o \
-		mod_layout.o \
-		mod_links.o \
-		mod_list.o \
-		mod_pre.o \
-		mod_tables.o \
-		search.o
+		m_fonts.o \
+		m_hline.o \
+		m_image.o \
+		m_layout.o \
+		m_links.o \
+		m_list.o \
+		m_pre.o \
+		m_tables.o \
+		search.o \
+		winpars.o
 
 HTMLDEPS = \
 		helpctrl.d \
 		helpdata.d \
 		helpfrm.d \
 		htmlcell.d \
-		htmlfilter.d \
-		htmlparser.d \
+		htmlfilt.d \
+		htmlpars.d \
 		htmltag.d \
 		htmlwin.d \
-		htmlwinparser.d \
-		mod_fonts.d \
-		mod_hline.d \
-		mod_image.d \
-		mod_layout.d \
-		mod_links.d \
-		mod_list.d \
-		mod_pre.d \
-		mod_tables.d \
-		search.d
-
-UNIXOBJS = \
+		m_fonts.d \
+		m_hline.d \
+		m_image.d \
+		m_layout.d \
+		m_links.d \
+		m_list.d \
+		m_pre.d \
+		m_tables.d \
+		search.d \
+		winpars.d
+
+UNIX_OBJS = \
+		dialup.o \
 		gsocket.o \
 		threadpsx.o \
 		utilsunx.o
 
-UNIXDEPS = \
+UNIX_DEPS = \
+		dialup.d \
 		gsocket.d \
 		threadpsx.d \
 		utilsunx.d
@@ -1805,16 +1936,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
@@ -1825,7 +1981,7 @@ all:    $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
 	@$(INSTALL) -d ./lib
 	$(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
 	
-CREATE_LINKS:  ./lib/@WX_TARGET_LIBRARY@
+CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
 	@$(RM) ./lib/@WX_LIBRARY_LINK1@
 	@$(RM) ./lib/@WX_LIBRARY_LINK2@
 	@$(RM) ./lib/@WX_LIBRARY_LINK3@
@@ -1833,13 +1989,13 @@ CREATE_LINKS:  ./lib/@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
 
@@ -1907,8 +2063,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."
@@ -1916,7 +2072,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 " "
@@ -1996,6 +2152,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
@@ -2005,9 +2162,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
@@ -2019,6 +2174,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)
@@ -2083,6 +2245,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
@@ -2111,6 +2278,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
@@ -2155,6 +2330,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
@@ -2182,10 +2369,31 @@ SAMPLES_DIST:
 	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/newgrid
+	cp $(SAMPDIR)/newgrid/Makefile.in $(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/*.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
@@ -2247,24 +2455,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