X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/257980e6f248bb46d06807f17b705e9a399f0a28..52a550200431778ae492a8f7ea149a072feac12a:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index fe45c6c8bc..5288191326 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 19:47, 1999/10/25
+# This file was automatically generated by tmake at 18:51, 1999/11/30
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -43,10 +43,11 @@ VP5 = @top_srcdir@/src/unix
 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
+VP9 = @top_srcdir@/src/tiff
+VP10 = @top_srcdir@/src/zlib
+VP11 = @top_srcdir@/src/iodbc
 
-VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10)
+VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10):$(VP11)
 
 top_srcdir = @top_srcdir@
 prefix = @prefix@
@@ -123,6 +124,7 @@ DOCDIR = $(WXDIR)/docs
 ########################## Archive name ###############################
 
 WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
+WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
 DISTDIR = ./_dist_dir/wx$(TOOLKIT)
 
 ############################## Files ##################################
@@ -204,6 +206,7 @@ WX_HEADERS = \
 		debug.h \
 		defs.h \
 		dialog.h \
+		dialup.h \
 		dirdlg.h \
 		dnd.h \
 		docmdi.h \
@@ -221,6 +224,9 @@ WX_HEADERS = \
 		filesys.h \
 		font.h \
 		fontdlg.h \
+		fontenum.h \
+		fontmap.h \
+		fontutil.h \
 		frame.h \
 		fs_inet.h \
 		fs_zip.h \
@@ -337,6 +343,7 @@ WX_HEADERS = \
 		wave.h \
 		wfstream.h \
 		window.h \
+		wizard.h \
 		wx.h \
 		wx_cw.h \
 		wx_cw_cm.h \
@@ -508,6 +515,7 @@ MSW_HEADERS = \
 		msw/gauge.h \
 		msw/gauge95.h \
 		msw/gaugemsw.h \
+		msw/gdiimage.h \
 		msw/gdiobj.h \
 		msw/helpwin.h \
 		msw/icon.h \
@@ -562,7 +570,8 @@ MSW_HEADERS = \
 		msw/xpmhand.h
 
 UNIX_HEADERS = \
-		unix/execute.h
+		unix/execute.h \
+		unix/fontutil.h
 
 GENERIC_HEADERS = \
 		generic/caret.h \
@@ -645,6 +654,7 @@ GTK_GENERICOBJS = \
 		scrolwin.o \
 		splitter.o \
 		statusbr.o \
+		tabg.o \
 		textdlgg.o \
 		tipdlg.o \
 		treectrl.o \
@@ -679,6 +689,7 @@ GTK_GENERICDEPS = \
 		scrolwin.d \
 		splitter.d \
 		statusbr.d \
+		tabg.d \
 		textdlgg.d \
 		tipdlg.d \
 		treectrl.d \
@@ -712,6 +723,7 @@ GTK_COMMONOBJS = \
 		filefn.o \
 		filesys.o \
 		fontcmn.o \
+		fontmap.o \
 		framecmn.o \
 		fs_inet.o \
 		fs_zip.o \
@@ -729,6 +741,7 @@ GTK_COMMONOBJS = \
 		imagpcx.o \
 		imagpng.o \
 		imagpnm.o \
+		imagtiff.o \
 		intl.o \
 		ipcbase.o \
 		layout.o \
@@ -736,6 +749,7 @@ GTK_COMMONOBJS = \
 		list.o \
 		log.o \
 		memory.o \
+		menucmn.o \
 		mimetype.o \
 		module.o \
 		mstream.o \
@@ -806,6 +820,7 @@ GTK_COMMONDEPS = \
 		filefn.d \
 		filesys.d \
 		fontcmn.d \
+		fontmap.d \
 		framecmn.d \
 		fs_inet.d \
 		fs_zip.d \
@@ -823,6 +838,7 @@ GTK_COMMONDEPS = \
 		imagpcx.d \
 		imagpng.d \
 		imagpnm.d \
+		imagtiff.d \
 		intl.d \
 		ipcbase.d \
 		layout.d \
@@ -830,6 +846,7 @@ GTK_COMMONDEPS = \
 		list.d \
 		log.d \
 		memory.d \
+		menucmn.d \
 		mimetype.d \
 		module.d \
 		mstream.d \
@@ -1096,6 +1113,7 @@ MOTIF_COMMONOBJS = \
 		filefn.o \
 		filesys.o \
 		fontcmn.o \
+		fontmap.o \
 		framecmn.o \
 		fs_inet.o \
 		fs_zip.o \
@@ -1113,6 +1131,7 @@ MOTIF_COMMONOBJS = \
 		imagpcx.o \
 		imagpng.o \
 		imagpnm.o \
+		imagtiff.o \
 		intl.o \
 		ipcbase.o \
 		layout.o \
@@ -1120,12 +1139,12 @@ MOTIF_COMMONOBJS = \
 		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 \
@@ -1191,6 +1210,7 @@ MOTIF_COMMONDEPS = \
 		filefn.d \
 		filesys.d \
 		fontcmn.d \
+		fontmap.d \
 		framecmn.d \
 		fs_inet.d \
 		fs_zip.d \
@@ -1208,6 +1228,7 @@ MOTIF_COMMONDEPS = \
 		imagpcx.d \
 		imagpng.d \
 		imagpnm.d \
+		imagtiff.d \
 		intl.d \
 		ipcbase.d \
 		layout.d \
@@ -1215,12 +1236,12 @@ MOTIF_COMMONDEPS = \
 		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 \
@@ -1283,7 +1304,6 @@ MOTIF_GUIOBJS = \
 		dialog.o \
 		filedlg.o \
 		font.o \
-		fontenum.o \
 		frame.o \
 		gauge.o \
 		gdiobj.o \
@@ -1339,7 +1359,6 @@ MOTIF_GUIDEPS = \
 		dialog.d \
 		filedlg.d \
 		font.d \
-		fontenum.d \
 		frame.d \
 		gauge.d \
 		gdiobj.d \
@@ -1442,6 +1461,7 @@ MSW_COMMONOBJS = \
 		filefn.o \
 		filesys.o \
 		fontcmn.o \
+		fontmap.o \
 		framecmn.o \
 		fs_inet.o \
 		fs_zip.o \
@@ -1459,6 +1479,7 @@ MSW_COMMONOBJS = \
 		imagpcx.o \
 		imagpng.o \
 		imagpnm.o \
+		imagtiff.o \
 		intl.o \
 		ipcbase.o \
 		layout.o \
@@ -1466,6 +1487,7 @@ MSW_COMMONOBJS = \
 		list.o \
 		log.o \
 		memory.o \
+		menucmn.o \
 		mimetype.o \
 		module.o \
 		mstream.o \
@@ -1537,6 +1559,7 @@ MSW_COMMONDEPS = \
 		filefn.d \
 		filesys.d \
 		fontcmn.d \
+		fontmap.d \
 		framecmn.d \
 		fs_inet.d \
 		fs_zip.d \
@@ -1554,6 +1577,7 @@ MSW_COMMONDEPS = \
 		imagpcx.d \
 		imagpng.d \
 		imagpnm.d \
+		imagtiff.d \
 		intl.d \
 		ipcbase.d \
 		layout.d \
@@ -1561,6 +1585,7 @@ MSW_COMMONDEPS = \
 		list.d \
 		log.d \
 		memory.d \
+		menucmn.d \
 		mimetype.d \
 		module.d \
 		mstream.d \
@@ -1630,14 +1655,18 @@ MSW_GUIOBJS = \
 		dcscreen.o \
 		dde.o \
 		dialog.o \
+		dialup.o \
 		dib.o \
 		dibutils.o \
 		dragimag.o \
 		filedlg.o \
 		font.o \
 		fontdlg.o \
+		fontenum.o \
+		fontutil.o \
 		frame.o \
 		gauge95.o \
+		gdiimage.o \
 		gdiobj.o \
 		gsocket.o \
 		helpwin.o \
@@ -1717,14 +1746,18 @@ MSW_GUIDEPS = \
 		dcscreen.d \
 		dde.d \
 		dialog.d \
+		dialup.d \
 		dib.d \
 		dibutils.d \
 		dragimag.d \
 		filedlg.d \
 		font.d \
 		fontdlg.d \
+		fontenum.d \
+		fontutil.d \
 		frame.d \
 		gauge95.d \
+		gdiimage.d \
 		gdiobj.d \
 		gsocket.d \
 		helpwin.d \
@@ -1811,6 +1844,7 @@ BASE_OBJS = \
 		utilscmn.o \
 		variant.o \
 		wxchar.o \
+		threadpsx.o \
 		utilsunx.o
 
 BASE_DEPS = \
@@ -1846,6 +1880,7 @@ BASE_DEPS = \
 		utilscmn.d \
 		variant.d \
 		wxchar.d \
+		threadpsx.d \
 		utilsunx.d
 
 HTMLOBJS = \
@@ -1866,7 +1901,6 @@ HTMLOBJS = \
 		m_list.o \
 		m_pre.o \
 		m_tables.o \
-		search.o \
 		winpars.o
 
 HTMLDEPS = \
@@ -1887,17 +1921,20 @@ HTMLDEPS = \
 		m_list.d \
 		m_pre.d \
 		m_tables.d \
-		search.d \
 		winpars.d
 
 UNIX_OBJS = \
 		dialup.o \
+		fontenum.o \
+		fontutil.o \
 		gsocket.o \
 		threadpsx.o \
 		utilsunx.o
 
 UNIX_DEPS = \
 		dialup.d \
+		fontenum.d \
+		fontutil.d \
 		gsocket.d \
 		threadpsx.d \
 		utilsunx.d
@@ -1984,6 +2021,41 @@ JPEGOBJS    = \
 		jquant2.o \
 		jdmerge.o
 
+TIFFOBJS	= \
+		tif_aux.o \
+		tif_close.o \
+		tif_codec.o \
+		tif_compress.o \
+		tif_dir.o \
+		tif_dirinfo.o \
+		tif_dirread.o \
+		tif_dirwrite.o \
+		tif_dumpmode.o \
+		tif_error.o \
+		tif_fax3.o \
+		tif_fax3sm.o \
+		tif_getimage.o \
+		tif_jpeg.o \
+		tif_flush.o \
+		tif_lzw.o \
+		tif_luv.o \
+		tif_next.o \
+		tif_open.o \
+		tif_packbits.o \
+		tif_pixarlog.o \
+		tif_predict.o \
+		tif_print.o \
+		tif_read.o \
+		tif_swab.o \
+		tif_strip.o \
+		tif_thunder.o \
+		tif_tile.o \
+		tif_unix.o \
+		tif_version.o \
+		tif_warning.o \
+		tif_write.o \
+		tif_zip.o
+
 IODBC_OBJS = \
 		catalog.o \
 		connect.o \
@@ -2265,76 +2337,116 @@ MSW_DIST:
 SAMPLES_DIST:
 	mkdir $(DISTDIR)/samples
 	cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
+	
 	mkdir $(DISTDIR)/samples/bombs
 	cp $(SAMPDIR)/bombs/Makefile.in $(DISTDIR)/samples/bombs
+	cp $(SAMPDIR)/bombs/makefile.unx $(DISTDIR)/samples/bombs
 	cp $(SAMPDIR)/bombs/*.cpp $(DISTDIR)/samples/bombs
 	cp $(SAMPDIR)/bombs/*.h $(DISTDIR)/samples/bombs
 	cp $(SAMPDIR)/bombs/*.xpm $(DISTDIR)/samples/bombs
 	cp $(SAMPDIR)/bombs/readme.txt $(DISTDIR)/samples/bombs
+	
 	mkdir $(DISTDIR)/samples/caret
 	cp $(SAMPDIR)/caret/Makefile.in $(DISTDIR)/samples/caret
+	cp $(SAMPDIR)/caret/makefile.unx $(DISTDIR)/samples/caret
 	cp $(SAMPDIR)/caret/*.cpp $(DISTDIR)/samples/caret
 	cp $(SAMPDIR)/caret/*.xpm $(DISTDIR)/samples/caret
+	
 	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/controls
 	mkdir $(DISTDIR)/samples/controls/icons
 	cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls
+	cp $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls
 	cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons
+	
 	mkdir $(DISTDIR)/samples/checklst
 	cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst
+	cp $(SAMPDIR)/checklst/makefile.unx $(DISTDIR)/samples/checklst
 	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
 	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/makefile.unx $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
+	
 	mkdir $(DISTDIR)/samples/dnd
 	cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd
+	cp $(SAMPDIR)/dnd/makefile.unx $(DISTDIR)/samples/dnd
+	cp $(SAMPDIR)/dnd/*.wxr $(DISTDIR)/samples/dnd
 	cp $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd
 	cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd
 	cp $(SAMPDIR)/dnd/*.txt $(DISTDIR)/samples/dnd
 	cp $(SAMPDIR)/dnd/*.png $(DISTDIR)/samples/dnd
+	
 	mkdir $(DISTDIR)/samples/docview
 	cp $(SAMPDIR)/docview/Makefile.in $(DISTDIR)/samples/docview
+	cp $(SAMPDIR)/docview/makefile.unx $(DISTDIR)/samples/docview
 	cp $(SAMPDIR)/docview/*.cpp $(DISTDIR)/samples/docview
 	cp $(SAMPDIR)/docview/*.h $(DISTDIR)/samples/docview
 	cp $(SAMPDIR)/docview/*.xpm $(DISTDIR)/samples/docview
+	
 	mkdir $(DISTDIR)/samples/docvwmdi
 	cp $(SAMPDIR)/docvwmdi/Makefile.in $(DISTDIR)/samples/docvwmdi
+	cp $(SAMPDIR)/docvwmdi/makefile.unx $(DISTDIR)/samples/docvwmdi
 	cp $(SAMPDIR)/docvwmdi/*.cpp $(DISTDIR)/samples/docvwmdi
 	cp $(SAMPDIR)/docvwmdi/*.h $(DISTDIR)/samples/docvwmdi
+	
 	mkdir $(DISTDIR)/samples/drawing
 	cp $(SAMPDIR)/drawing/Makefile.in $(DISTDIR)/samples/drawing
+	cp $(SAMPDIR)/drawing/makefile.unx $(DISTDIR)/samples/drawing
 	cp $(SAMPDIR)/drawing/*.cpp $(DISTDIR)/samples/drawing
 	cp $(SAMPDIR)/drawing/*.xpm $(DISTDIR)/samples/drawing
+	
 	mkdir $(DISTDIR)/samples/dynamic
 	cp $(SAMPDIR)/dynamic/Makefile.in $(DISTDIR)/samples/dynamic
+	cp $(SAMPDIR)/dynamic/makefile.unx $(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/makefile.unx $(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/makefile.unx $(DISTDIR)/samples/fractal
 	cp $(SAMPDIR)/fractal/*.cpp $(DISTDIR)/samples/fractal
+	
+	mkdir $(DISTDIR)/samples/help
+	mkdir $(DISTDIR)/samples/help/doc
+	cp $(SAMPDIR)/help/Makefile.in $(DISTDIR)/samples/help
+	cp $(SAMPDIR)/help/makefile.unx $(DISTDIR)/samples/help
+	cp $(SAMPDIR)/help/*.cpp $(DISTDIR)/samples/help
+	cp $(SAMPDIR)/help/*.xpm $(DISTDIR)/samples/help
+	cp $(SAMPDIR)/help/doc/*.* $(DISTDIR)/samples/help/doc
+	
 	mkdir $(DISTDIR)/samples/html
 	cp $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html
 	mkdir $(DISTDIR)/samples/html/about
@@ -2348,6 +2460,10 @@ 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/*.cpp $(DISTDIR)/samples/html/printing
@@ -2372,14 +2488,18 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/html/zip/*.cpp $(DISTDIR)/samples/html/zip
 	cp $(SAMPDIR)/html/zip/*.htm $(DISTDIR)/samples/html/zip
 	cp $(SAMPDIR)/html/zip/*.zip $(DISTDIR)/samples/html/zip
+	
 	mkdir $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/Makefile.in $(DISTDIR)/samples/image
+	cp $(SAMPDIR)/image/makefile.unx $(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/makefile.unx $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/*.xpm $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/*.txt $(DISTDIR)/samples/internat
@@ -2388,56 +2508,83 @@ SAMPLES_DIST:
 	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/makefile.unx $(DISTDIR)/samples/layout
 	cp $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout
 	cp $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout
+	
 	mkdir $(DISTDIR)/samples/listctrl
+	mkdir $(DISTDIR)/samples/listctrl/bitmaps
 	cp $(SAMPDIR)/listctrl/Makefile.in $(DISTDIR)/samples/listctrl
+	cp $(SAMPDIR)/listctrl/makefile.unx $(DISTDIR)/samples/listctrl
 	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/bitmaps
 	cp $(SAMPDIR)/listctrl/bitmaps/*.xpm $(DISTDIR)/samples/listctrl/bitmaps
+	
 	mkdir $(DISTDIR)/samples/mdi
+	mkdir $(DISTDIR)/samples/mdi/bitmaps
 	cp $(SAMPDIR)/mdi/Makefile.in $(DISTDIR)/samples/mdi
+	cp $(SAMPDIR)/mdi/makefile.unx $(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/memcheck
+	cp $(SAMPDIR)/memcheck/Makefile.in $(DISTDIR)/samples/memcheck
+	cp $(SAMPDIR)/memcheck/makefile.unx $(DISTDIR)/samples/memcheck
+	cp $(SAMPDIR)/memcheck/*.cpp $(DISTDIR)/samples/memcheck
+	cp $(SAMPDIR)/memcheck/*.xpm $(DISTDIR)/samples/memcheck
+	
+	mkdir $(DISTDIR)/samples/menu
+	cp $(SAMPDIR)/menu/Makefile.in $(DISTDIR)/samples/menu
+	cp $(SAMPDIR)/menu/makefile.unx $(DISTDIR)/samples/menu
+	cp $(SAMPDIR)/menu/*.cpp $(DISTDIR)/samples/menu
+	
 	mkdir $(DISTDIR)/samples/minifram
+	mkdir $(DISTDIR)/samples/minifram/bitmaps
 	cp $(SAMPDIR)/minifram/Makefile.in $(DISTDIR)/samples/minifram
+	cp $(SAMPDIR)/minifram/makefile.unx $(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/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/makefile.unx $(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
 	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
@@ -2449,6 +2596,10 @@ SAMPLES_DIST:
 	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
@@ -2472,7 +2623,6 @@ 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/bitmaps
 	cp $(SAMPDIR)/toolbar/bitmaps/*.xpm $(DISTDIR)/samples/toolbar/bitmaps
@@ -2545,6 +2695,8 @@ MISC_DIST:
 	
 dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST
 	cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
+	mv _dist_dir/wx$(TOOLKIT)/samples _dist_dir/wx$(TOOLKIT)/wxSamples
+	cd _dist_dir/wx$(TOOLKIT); tar ch wxSamples | gzip -f9 > $(WXSAMPLES); mv $(WXSAMPLES) ../..
 	$(RM) -r _dist_dir
 
 clean: