X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46132182f033f8e24e89036b6111fa470bb4abb0..8a693e6e0460b6b3c32e4b6f114a3ab7b7cd24ea:/Makefile.in?ds=sidebyside

diff --git a/Makefile.in b/Makefile.in
index 21db9f2ddb..32d3e0e95c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -128,6 +128,7 @@ DOCDIR = $(WXDIR)/docs
 ########################## Archive name ###############################
 
 WXARCHIVE = @DISTDIR@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
+WXGLARCHIVE = @DISTDIR@-gl-$(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
 WXDEMOS = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
 DISTDIR = ./_dist_dir/@DISTDIR@
@@ -286,6 +287,7 @@ IODBCOBJS = \
 ############################## Rules ##################################
 
 BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
+BURNT_LIBRARY_NAME_GL = @BURNT_LIBRARY_NAME_GL@
 
 all: @WX_ALL@
 
@@ -294,25 +296,54 @@ all: @WX_ALL@
 	$(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
 	$(RANLIB) ./lib/$@
 
+@WX_LIBRARY_NAME_STATIC_GL@:  glcanvas.o
+	@$(INSTALL) -d ./lib
+	$(AR) $(AROPTIONS) ./lib/$@ glcanvas.o
+	$(RANLIB) ./lib/$@
+
 @WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
 	@$(INSTALL) -d ./lib
 	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
 	
+@WX_LIBRARY_NAME_SHARED_GL@:  glcanvas.o
+	@$(INSTALL) -d ./lib
+	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)
+	
 CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
 	@$(RM) ./lib/@WX_LIBRARY_LINK1@
 	@$(RM) ./lib/@WX_LIBRARY_LINK2@
 	@$(RM) ./lib/@WX_LIBRARY_LINK3@
-	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@
-	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
-	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
+	cd lib \
+		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
+		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
+		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
+	
+CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
+	@$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
+	@$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
+	@$(RM) ./lib/@WX_LIBRARY_LINK3_GL@
+	cd lib \
+		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \
+		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \
+		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@
 	
 CREATE_INSTALLED_LINKS: preinstall
 	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
 	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
 	$(RM) $(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@
+	cd $(libdir) \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
+	
+CREATE_INSTALLED_LINKS_GL: preinstall_gl
+	$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
+	$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
+	$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
+	cd $(libdir) \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@
 	
 $(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
 
@@ -349,7 +380,7 @@ afminstall: preinstall
 
 # this is the real install target: copies the library, wx-config and the
 # headers to the installation directory
-preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
+preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_DIR@-config
 	@echo " "
 	@echo " Installing wxWindows..."
 	@echo " "
@@ -358,7 +389,8 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
 	$(INSTALL) -d $(bindir)
 	$(INSTALL) -d $(libdir)
 
-	$(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
+	$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLKIT_DIR@-config $(bindir)/wx@TOOLKIT_DIR@-config
+	cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_DIR@-config wx-config
 	$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
 
 	$(INSTALL) -d $(libdir)/wx
@@ -378,6 +410,13 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
 	  echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
 	done
 
+preinstall_gl: $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@
+	@echo " "
+	@echo " Installing wxWindows OpenGl add-on..."
+	@echo " "
+	$(INSTALL) -d $(libdir)
+	$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
+
 install: @AFMINSTALL@ @WX_ALL_INSTALLED@
 	@echo " "
 	@echo " The installation of wxWindows is finished.  On certain"
@@ -400,14 +439,21 @@ uninstall:
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK2@
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK3@
+	@echo " Removing GL library..."
+	@$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@
+	@$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
+	@$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
+	@$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
 	@echo " Removing helper files..."
 	@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
 	@$(RM) $(bindir)/wx-config
+	@$(RM) $(bindir)/wx@TOOLKIT_DIR@-config
 	@$(RM) $(datadir)/wx/afm/*
 	@$(RM) $(datadir)/wx/gs_afm/*
-	@rmdir $(datadir)/wx/gs_afm
-	@rmdir $(datadir)/wx/afm
-	@rmdir $(datadir)/wx
+# FIXME: wxBase doesnt install these next 3 dirs.
+	@-rmdir $(datadir)/wx/gs_afm
+	@-rmdir $(datadir)/wx/afm
+	@-rmdir $(datadir)/wx
 	@echo " Removing headers..."
 	@list='$(HEADERS)'; for p in $$list; do \
 	  $(RM) $(includedir)/wx/$$p; \
@@ -439,10 +485,21 @@ ALL_DIST: distclean
 	cp $(WXDIR)/mkinstalldirs $(DISTDIR)
 	cp $(WXDIR)/wx-config.in $(DISTDIR)
 	cp $(WXDIR)/setup.h.in $(DISTDIR)
+	cp $(WXDIR)/setup.h_vms $(DISTDIR)
+	cp $(WXDIR)/descrip.mms $(DISTDIR)
 	cp $(WXDIR)/Makefile.in $(DISTDIR)
 	cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
 	cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
 	cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt
+	mkdir $(DISTDIR)/lib
+	cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib
+	cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib
+	mkdir $(DISTDIR)/src
+	mkdir $(DISTDIR)/src/zlib
+	cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
+	cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
+	cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
+	cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
 
 # this target is the common part of distribution script for all GUI toolkits,
 # but is not used when building wxBase distribution
@@ -467,7 +524,6 @@ ALL_GUI_DIST: ALL_DIST
 	cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
 	cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
 	cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
-	mkdir $(DISTDIR)/src
 	mkdir $(DISTDIR)/src/common
 	mkdir $(DISTDIR)/src/generic
 	mkdir $(DISTDIR)/src/html
@@ -476,28 +532,27 @@ ALL_GUI_DIST: ALL_DIST
 	mkdir $(DISTDIR)/src/png
 	mkdir $(DISTDIR)/src/jpeg
 	mkdir $(DISTDIR)/src/tiff
-	mkdir $(DISTDIR)/src/zlib
 	mkdir $(DISTDIR)/src/iodbc
 	mkdir $(DISTDIR)/src/unix
 	cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
 	cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
 	cp $(COMMDIR)/*.c $(DISTDIR)/src/common
-	cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix
-	cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
 	cp $(COMMDIR)/*.inc $(DISTDIR)/src/common
 	cp $(COMMDIR)/*.l $(DISTDIR)/src/common
 	cp $(COMMDIR)/*.h $(DISTDIR)/src/common
 	cp $(COMMDIR)/*.y $(DISTDIR)/src/common
+	cp $(COMMDIR)/*.mms $(DISTDIR)/src/common
+	cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix
+	cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
+	cp $(UNIXDIR)/*.mms $(DISTDIR)/src/unix
 	cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic
+	cp $(GENDIR)/*.mms $(DISTDIR)/src/generic
 	cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
 	cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps
 	cp $(PNGDIR)/*.h $(DISTDIR)/src/png
 	cp $(PNGDIR)/*.c $(DISTDIR)/src/png
 	cp $(PNGDIR)/README $(DISTDIR)/src/png
-	cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
-	cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
-	cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
 	cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
 	cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
 	cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
@@ -517,7 +572,6 @@ BASE_DIST: ALL_DIST
 	mkdir $(DISTDIR)/include/wx
 	mkdir $(DISTDIR)/include/wx/protocol
 	mkdir $(DISTDIR)/include/wx/unix
-	mkdir $(DISTDIR)/src
 	mkdir $(DISTDIR)/src/common
 	mkdir $(DISTDIR)/src/unix
 	cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
@@ -529,6 +583,7 @@ BASE_DIST: ALL_DIST
 	cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
 	cp $(DOCDIR)/todo.txt $(DISTDIR)/TODO.txt
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
+	cp $(WXDIR)/src/common/unzip.h $(DISTDIR)/src/common/unzip.h
 	list='$(HEADERS)'; for p in $$list; do \
 	  cp $(WXDIR)/include/wx/$$p $(DISTDIR)/include/wx/$$p; \
 	done
@@ -543,6 +598,9 @@ GTK_DIST: ALL_GUI_DIST
 	cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk
 	cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk
 	cp $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk
+	cp $(GTKDIR)/*.mms $(DISTDIR)/src/gtk
+	mkdir $(DISTDIR)/contrib
+	cp -R $(WXDIR)/contrib $(DISTDIR)
 
 MOTIF_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxMOTIF.spec $(DISTDIR)
@@ -570,9 +628,11 @@ MSW_DIST: ALL_GUI_DIST
 DEMOS_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/demos
 	cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos
-	cp $(DEMODIR)/configure $(DISTDIR)/samples
-	cp $(DEMODIR)/configure.in $(DISTDIR)/samples
-
+	cp $(DEMODIR)/configure $(DISTDIR)/demos
+	cp $(DEMODIR)/configure.in $(DISTDIR)/demos
+	
+	cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
+	    
 	mkdir $(DISTDIR)/demos/bombs
 	cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs
 	cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs
@@ -596,11 +656,13 @@ DEMOS_DIST: ALL_GUI_DIST
 	cp $(DEMODIR)/life/*.cpp $(DISTDIR)/demos/life
 	cp $(DEMODIR)/life/*.h $(DISTDIR)/demos/life
 	cp $(DEMODIR)/life/*.xpm $(DISTDIR)/demos/life
+	cp $(DEMODIR)/life/*.inc $(DISTDIR)/demos/life
 	cp $(DEMODIR)/life/bitmaps/*.xpm $(DISTDIR)/demos/life/bitmaps
 	
 	mkdir $(DISTDIR)/demos/poem
 	cp $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem
 	cp $(DEMODIR)/poem/makefile.unx $(DISTDIR)/demos/poem
+	cp $(DEMODIR)/poem/*.h $(DISTDIR)/demos/poem
 	cp $(DEMODIR)/poem/*.cpp $(DISTDIR)/demos/poem
 	cp $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem
 	cp $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem
@@ -616,56 +678,59 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
 	cp $(SAMPDIR)/configure $(DISTDIR)/samples
 	cp $(SAMPDIR)/configure.in $(DISTDIR)/samples
-	
+
+	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/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/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/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
+	cp $(SAMPDIR)/checklst/*.mms $(DISTDIR)/samples/checklst
+
 	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
 	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/*.mms $(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/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
-	
+	cp $(SAMPDIR)/dialogs/*.mms $(DISTDIR)/samples/dialogs
+
 	mkdir $(DISTDIR)/samples/dnd
 	cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd
 	cp $(SAMPDIR)/dnd/makefile.unx $(DISTDIR)/samples/dnd
@@ -674,52 +739,56 @@ SAMPLES_DIST: ALL_GUI_DIST
 	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/dragimag
+	cp $(SAMPDIR)/dragimag/Makefile.in $(DISTDIR)/samples/dragimag
+	cp $(SAMPDIR)/dragimag/makefile.unx $(DISTDIR)/samples/dragimag
+	cp $(SAMPDIR)/dragimag/*.cpp $(DISTDIR)/samples/dragimag
+	cp $(SAMPDIR)/dragimag/*.h $(DISTDIR)/samples/dragimag
+	cp $(SAMPDIR)/dragimag/*.xpm $(DISTDIR)/samples/dragimag
+	cp $(SAMPDIR)/dragimag/*.png $(DISTDIR)/samples/dragimag
+
 	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
-	
+	cp $(SAMPDIR)/drawing/*.bmp $(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/exec
 	cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec
+	cp $(SAMPDIR)/exec/makefile.unx $(DISTDIR)/samples/exec
 	cp $(SAMPDIR)/exec/*.cpp $(DISTDIR)/samples/exec
-	
-	mkdir $(DISTDIR)/samples/ipc
-	cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
-	cp $(SAMPDIR)/ipc/*.xpm $(DISTDIR)/samples/ipc
-	cp $(SAMPDIR)/ipc/*.h $(DISTDIR)/samples/ipc
-	cp $(SAMPDIR)/ipc/*.cpp $(DISTDIR)/samples/ipc
-	
+
 	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/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
@@ -727,7 +796,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	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
@@ -754,6 +823,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/html/test/*.cpp $(DISTDIR)/samples/html/test
 	cp $(SAMPDIR)/html/test/*.bmp $(DISTDIR)/samples/html/test
 	cp $(SAMPDIR)/html/test/*.png $(DISTDIR)/samples/html/test
+	cp $(SAMPDIR)/html/test/*.gif $(DISTDIR)/samples/html/test
 	cp $(SAMPDIR)/html/test/*.htm $(DISTDIR)/samples/html/test
 	cp $(SAMPDIR)/html/test/*.html $(DISTDIR)/samples/html/test
 	mkdir $(DISTDIR)/samples/html/virtual
@@ -769,11 +839,12 @@ SAMPLES_DIST: ALL_GUI_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/*.mms $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image
@@ -787,17 +858,31 @@ SAMPLES_DIST: ALL_GUI_DIST
 	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/fr/*.mo $(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
-	
+	cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de
+
+	mkdir $(DISTDIR)/samples/ipc
+	cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
+	cp $(SAMPDIR)/ipc/makefile.unx $(DISTDIR)/samples/ipc
+	cp $(SAMPDIR)/ipc/*.cpp $(DISTDIR)/samples/ipc
+	cp $(SAMPDIR)/ipc/*.h $(DISTDIR)/samples/ipc
+	cp $(SAMPDIR)/ipc/*.xpm $(DISTDIR)/samples/ipc
+
+	mkdir $(DISTDIR)/samples/joytest
+	cp $(SAMPDIR)/joytest/Makefile.in $(DISTDIR)/samples/joytest
+	cp $(SAMPDIR)/joytest/makefile.unx $(DISTDIR)/samples/joytest
+	cp $(SAMPDIR)/joytest/*.cpp $(DISTDIR)/samples/joytest
+	cp $(SAMPDIR)/joytest/*.h $(DISTDIR)/samples/joytest
+	cp $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest
+
 	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
@@ -806,7 +891,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/listctrl/*.h $(DISTDIR)/samples/listctrl
 	cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl
 	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
@@ -815,18 +900,18 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/mdi/*.h $(DISTDIR)/samples/mdi
 	cp $(SAMPDIR)/mdi/*.xpm $(DISTDIR)/samples/mdi
 	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
@@ -835,37 +920,64 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/minifram/*.h $(DISTDIR)/samples/minifram
 	cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram
 	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
-	
+	cp $(SAMPDIR)/minimal/*.mms $(DISTDIR)/samples/minimal
+
 	mkdir $(DISTDIR)/samples/dialup
 	cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup
 	cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup
 	cp $(SAMPDIR)/dialup/*.cpp $(DISTDIR)/samples/dialup
-	
+
 	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/opengl
+	cp $(SAMPDIR)/opengl/Makefile.in $(DISTDIR)/samples/opengl
+	mkdir $(DISTDIR)/samples/opengl/penguin
+	cp $(SAMPDIR)/opengl/penguin/Makefile.in $(DISTDIR)/samples/opengl/penguin
+	cp $(SAMPDIR)/opengl/penguin/makefile.unx $(DISTDIR)/samples/opengl/penguin
+	cp $(SAMPDIR)/opengl/penguin/*.cpp $(DISTDIR)/samples/opengl/penguin
+	cp $(SAMPDIR)/opengl/penguin/*.c $(DISTDIR)/samples/opengl/penguin
+	cp $(SAMPDIR)/opengl/penguin/*.h $(DISTDIR)/samples/opengl/penguin
+	cp $(SAMPDIR)/opengl/penguin/*.lwo $(DISTDIR)/samples/opengl/penguin
+	mkdir $(DISTDIR)/samples/opengl/cube
+	cp $(SAMPDIR)/opengl/cube/Makefile.in $(DISTDIR)/samples/opengl/cube
+	cp $(SAMPDIR)/opengl/cube/makefile.unx $(DISTDIR)/samples/opengl/cube
+	cp $(SAMPDIR)/opengl/cube/*.cpp $(DISTDIR)/samples/opengl/cube
+	cp $(SAMPDIR)/opengl/cube/*.h $(DISTDIR)/samples/opengl/cube
+	mkdir $(DISTDIR)/samples/opengl/isosurf
+	cp $(SAMPDIR)/opengl/isosurf/Makefile.in $(DISTDIR)/samples/opengl/isosurf
+	cp $(SAMPDIR)/opengl/isosurf/makefile.unx $(DISTDIR)/samples/opengl/isosurf
+	cp $(SAMPDIR)/opengl/isosurf/*.cpp $(DISTDIR)/samples/opengl/isosurf
+	cp $(SAMPDIR)/opengl/isosurf/*.h $(DISTDIR)/samples/opengl/isosurf
+	cp $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf
+
+	mkdir $(DISTDIR)/samples/plot
+	cp $(SAMPDIR)/plot/Makefile.in $(DISTDIR)/samples/plot
+	cp $(SAMPDIR)/plot/makefile.unx $(DISTDIR)/samples/plot
+	cp $(SAMPDIR)/plot/*.cpp $(DISTDIR)/samples/plot
+
 	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
@@ -873,14 +985,14 @@ SAMPLES_DIST: ALL_GUI_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/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
-	
+
 	mkdir $(DISTDIR)/samples/rotate
 	cp $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate
 	cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate
@@ -889,6 +1001,7 @@ SAMPLES_DIST: ALL_GUI_DIST
     
 	mkdir $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
+	cp $(SAMPDIR)/richedit/makefile.unx $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/*.cpp $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/*.h $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/*.xpm $(DISTDIR)/samples/richedit
@@ -897,16 +1010,19 @@ SAMPLES_DIST: ALL_GUI_DIST
     
 	mkdir $(DISTDIR)/samples/proplist
 	cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist
+	cp $(SAMPDIR)/proplist/makefile.unx $(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/makefile.unx $(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/makefile.unx $(DISTDIR)/samples/sashtest
 	cp $(SAMPDIR)/sashtest/*.cpp $(DISTDIR)/samples/sashtest
 	cp $(SAMPDIR)/sashtest/*.h $(DISTDIR)/samples/sashtest
     
@@ -920,13 +1036,20 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/scrollsub/makefile.unx $(DISTDIR)/samples/scrollsub
 	cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub
     
+	mkdir $(DISTDIR)/samples/sockets
+	cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets
+	cp $(SAMPDIR)/sockets/makefile.unx $(DISTDIR)/samples/sockets
+	cp $(SAMPDIR)/sockets/*.cpp $(DISTDIR)/samples/sockets
+	cp $(SAMPDIR)/sockets/*.xpm $(DISTDIR)/samples/sockets
+
 	mkdir $(DISTDIR)/samples/splitter
-	cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
+	cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter
     
 	mkdir $(DISTDIR)/samples/statbar
 	cp $(SAMPDIR)/statbar/Makefile.in $(DISTDIR)/samples/statbar
+	cp $(SAMPDIR)/statbar/makefile.unx $(DISTDIR)/samples/statbar
 	cp $(SAMPDIR)/statbar/*.cpp $(DISTDIR)/samples/statbar
 	cp $(SAMPDIR)/statbar/*.xpm $(DISTDIR)/samples/statbar
 
@@ -943,6 +1066,7 @@ SAMPLES_DIST: ALL_GUI_DIST
     
 	mkdir $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/Makefile.in $(DISTDIR)/samples/toolbar
+	cp $(SAMPDIR)/toolbar/makefile.unx $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/*.cpp $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar
 	mkdir $(DISTDIR)/samples/toolbar/bitmaps
@@ -950,64 +1074,69 @@ SAMPLES_DIST: ALL_GUI_DIST
     
 	mkdir $(DISTDIR)/samples/treectrl
 	cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl
+	cp $(SAMPDIR)/treectrl/makefile.unx $(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/treectrl/bitmaps
+	cp $(SAMPDIR)/treectrl/bitmaps/*.bmp $(DISTDIR)/samples/treectrl/bitmaps
+    
+	mkdir $(DISTDIR)/samples/treelay
+	cp $(SAMPDIR)/treelay/Makefile.in $(DISTDIR)/samples/treelay
+	cp $(SAMPDIR)/treelay/makefile.unx $(DISTDIR)/samples/treelay
+	cp $(SAMPDIR)/treelay/*.cpp $(DISTDIR)/samples/treelay
+	cp $(SAMPDIR)/treelay/*.h $(DISTDIR)/samples/treelay
     
 	mkdir $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest
+	cp $(SAMPDIR)/typetest/makefile.unx $(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/makefile.unx $(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/makefile.unx $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard
     
-	mkdir $(DISTDIR)/samples/sockets
-	cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets
-	cp $(SAMPDIR)/sockets/*.cpp $(DISTDIR)/samples/sockets
-	cp $(SAMPDIR)/sockets/*.xpm $(DISTDIR)/samples/sockets
-
 UTILS_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/utils
 	cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
-	cp $(UTILSDIR)/configure $(DISTDIR)/samples
-	cp $(UTILSDIR)/configure.in $(DISTDIR)/samples
-	
-	mkdir $(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
-	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
-	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
-	
+	cp $(UTILSDIR)/configure $(DISTDIR)/utils
+	cp $(UTILSDIR)/configure.in $(DISTDIR)/utils
+
+	mkdir $(DISTDIR)/utils/tex2rtf
+	mkdir $(DISTDIR)/utils/tex2rtf/src
+	cp $(UTILSDIR)/tex2rtf/*.in $(DISTDIR)/utils/tex2rtf
+	cp $(UTILSDIR)/tex2rtf/src/*.h $(DISTDIR)/utils/tex2rtf/src
+	cp $(UTILSDIR)/tex2rtf/src/*.in $(DISTDIR)/utils/tex2rtf/src
+	cp $(UTILSDIR)/tex2rtf/src/*.cpp $(DISTDIR)/utils/tex2rtf/src
+	cp $(UTILSDIR)/tex2rtf/src/tex2rtf.* $(DISTDIR)/utils/tex2rtf/src
+
+	mkdir $(DISTDIR)/utils/makegen
+	mkdir $(DISTDIR)/utils/makegen/templates
+	cp $(UTILSDIR)/makegen/Makefile.in $(DISTDIR)/utils/makegen
+	cp $(UTILSDIR)/makegen/*.cpp $(DISTDIR)/utils/makegen
+	cp $(UTILSDIR)/makegen/templates/*.* $(DISTDIR)/utils/makegen/templates
+
+	mkdir $(DISTDIR)/utils/hhp2cached
+	cp $(UTILSDIR)/hhp2cached/*.* $(DISTDIR)/utils/hhp2cached
+
+	mkdir $(DISTDIR)/utils/HelpGen
+	mkdir $(DISTDIR)/utils/HelpGen/src
+	cp $(UTILSDIR)/HelpGen/Makefile.in $(DISTDIR)/utils/HelpGen
+	cp $(UTILSDIR)/HelpGen/src/*.* $(DISTDIR)/utils/HelpGen/src
+
+	cp -R $(UTILSDIR)/dialoged $(DISTDIR)/utils/dialoged
+
 MISC_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/misc
 	mkdir $(DISTDIR)/misc/afm
@@ -1015,6 +1144,50 @@ MISC_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/misc/gs_afm
 	cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm
 
+MANUAL_DIST:
+	mkdir $(DISTDIR)/docs
+	mkdir $(DISTDIR)/docs/latex
+	mkdir $(DISTDIR)/docs/latex/wx
+	cp $(DOCDIR)/latex/wx/*.tex $(DISTDIR)/docs/latex/wx
+	cp $(DOCDIR)/latex/wx/*.gif $(DISTDIR)/docs/latex/wx
+	cp $(DOCDIR)/latex/wx/*.ini $(DISTDIR)/docs/latex/wx
+	cp $(DOCDIR)/latex/wx/*.bib $(DISTDIR)/docs/latex/wx
+	cp $(DOCDIR)/latex/wx/*.sty $(DISTDIR)/docs/latex/wx
+
+# this target does not generate a complete wxPython dist, it only includes
+# those files needed for the Debian source package.
+# see utils/wxPython/distrib for scripts to make a proper wxPython dist.
+PYTHON_DIST:
+	mkdir $(DISTDIR)/utils/wxPython
+	mkdir $(DISTDIR)/utils/wxPython/demo
+	mkdir $(DISTDIR)/utils/wxPython/demo/bitmaps
+	mkdir $(DISTDIR)/utils/wxPython/demo/data
+	mkdir $(DISTDIR)/utils/wxPython/distrib
+	mkdir $(DISTDIR)/utils/wxPython/lib
+	mkdir $(DISTDIR)/utils/wxPython/lib/editor
+	mkdir $(DISTDIR)/utils/wxPython/lib/sizers
+	mkdir $(DISTDIR)/utils/wxPython/modules
+	mkdir $(DISTDIR)/utils/wxPython/modules/html
+	mkdir $(DISTDIR)/utils/wxPython/modules/utils
+	mkdir $(DISTDIR)/utils/wxPython/modules/utils/gtk
+	mkdir $(DISTDIR)/utils/wxPython/src
+	mkdir $(DISTDIR)/utils/wxPython/src/gtk
+
+	cp $(UTILSDIR)/wxPython/*.txt $(DISTDIR)/utils/wxPython
+	-cp $(UTILSDIR)/wxPython/demo/* $(DISTDIR)/utils/wxPython/demo
+	-cp $(UTILSDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/utils/wxPython/demo/bitmaps
+	-cp $(UTILSDIR)/wxPython/demo/data/* $(DISTDIR)/utils/wxPython/demo/data
+	cp $(UTILSDIR)/wxPython/distrib/build.py $(DISTDIR)/utils/wxPython/distrib
+	cp $(UTILSDIR)/wxPython/lib/*.py $(DISTDIR)/utils/wxPython/lib
+	cp $(UTILSDIR)/wxPython/lib/editor/*.py $(DISTDIR)/utils/wxPython/lib/editor
+	cp $(UTILSDIR)/wxPython/lib/sizers/*.py $(DISTDIR)/utils/wxPython/lib/sizers
+	-cp $(UTILSDIR)/wxPython/modules/html/* $(DISTDIR)/utils/wxPython/modules/html
+	-cp $(UTILSDIR)/wxPython/modules/utils/* $(DISTDIR)/utils/wxPython/modules/utils
+	cp $(UTILSDIR)/wxPython/modules/utils/gtk/utils.* $(DISTDIR)/utils/wxPython/modules/utils/gtk
+	-cp $(UTILSDIR)/wxPython/src/* $(DISTDIR)/utils/wxPython/src
+	cp $(UTILSDIR)/wxPython/src/gtk/*.py $(DISTDIR)/utils/wxPython/src/gtk
+	cp $(UTILSDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/utils/wxPython/src/gtk
+
 distclean:
 	$(RM) -r _dist_dir
 
@@ -1031,11 +1204,22 @@ dist: @GUIDIST@
 	mv wxDemos demos; \
 	fi
 
+debian-dist: @GUIDIST@ MANUAL_DIST PYTHON_DIST
+	mkdir $(DISTDIR)/debian
+	-cp $(WXDIR)/debian/* $(DISTDIR)/debian
+	cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
+	cp $(DOCDIR)/licence.txt $(DISTDIR)/docs
+	cp $(DOCDIR)/licendoc.txt $(DISTDIR)/docs
+	cp $(DOCDIR)/preamble.txt $(DISTDIR)/docs
+	rm -f $(DISTDIR)/*.spec
+	rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
+	mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
+
 clean:
 	$(RM) *.o
 	$(RM) *.d
 	$(RM) parser.c
 	$(RM) lexer.c
-	$(RM) ./lib/*
+	$(RM) -r ./lib/*
 
 cleanall: clean