X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/257980e6f248bb46d06807f17b705e9a399f0a28..9260520f907c04e6b0909f142d3f5ceee385a1d6:/distrib/msw/tmake/unx.t

diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t
index 597ef9634d..0e9c22bda0 100644
--- a/distrib/msw/tmake/unx.t
+++ b/distrib/msw/tmake/unx.t
@@ -8,7 +8,8 @@
 #!################################################################################
 #${
     #! include the code which parses filelist.txt file and initializes
-    #! %wxCommon, %wxGeneric, %wxHtml, %wxUnix and %wxGTK hashes.
+    #! %wxCommon, %wxGeneric, %wxHtml, %wxUnix, %wxGTK, %wxMOTIF and
+    #! %wxOS2PM hashes.
     IncludeTemplate("filelist.t");
 
     #! Generic
@@ -39,6 +40,7 @@
     }
 
     foreach $file (sort keys %wxGeneric) {
+        #! skip generic files not required for the wxMotif port
         next if $wxGeneric{$file} =~ /\bX\b/;
 
         $file2 = $file;
@@ -48,6 +50,17 @@
         $project{"WXMOTIF_GENERICDEPS"} .= $file2 . " "
     }
 
+    foreach $file (sort keys %wxGeneric) {
+        #! skip generic files not required for the wxPM port
+        next if $wxGeneric{$file} =~ /\bP\b/;
+
+        $file2 = $file;
+        $file =~ s/cp?p?$/\o/;
+        $file2 =~ s/cp?p?$/\d/;
+        $project{"WXOS2PM_GENERICOBJS"} .= $file . " ";
+        $project{"WXOS2PM_GENERICDEPS"} .= $file2 . " "
+    }
+
     #! Base
 
     foreach $file (sort keys %wxBase) {
@@ -78,6 +91,10 @@
             $project{"WXMOTIF_COMMONOBJS"} .= $fileobj . " ";
             $project{"WXMOTIF_COMMONDEPS"} .= $filedep . " "
         }
+        if ( $wxCommon{$file} !~ /\bP\b/ ) {    #! unless not for OS2PM
+            $project{"WXOS2PM_COMMONOBJS"} .= $fileobj . " ";
+            $project{"WXOS2PM_COMMONDEPS"} .= $filedep . " ";
+        }
 
         #! ODBC needs extra files (sql*.h) so not compiled by default.
         if ( (file !~ /^odbc\./) && ($wxCommon{$file} !~ /\b(16)\b/) ) {
@@ -119,6 +136,14 @@
         $project{"WXMOTIF_GUIDEPS"} .= $file2 . " "
     }
 
+    foreach $file (sort keys %wxOS2PM) {
+        $file2 = $file;
+        $file =~ s/cp?p?$/\o/;
+        $file2 =~ s/cp?p?$/\d/;
+        $project{"WXOS2PM_GUIOBJS"} .= $file . " ";
+        $project{"WXOS2PM_GUIDEPS"} .= $file2 . " "
+    }
+
     #! others
     
     foreach $file (sort keys %wxHTML) {
@@ -161,11 +186,15 @@
     foreach $file (sort keys %wxGTKINCLUDE) {
         $project{"WXGTK_HEADERS"} .= "gtk/" . $file . " "
     }
+
+    foreach $file (sort keys %wxOS2PMINCLUDE) {
+        $project{"WXOS2PM_HEADERS"} .= "os2/" . $file . " "
+    }
     
     foreach $file (sort keys %wxMSWINCLUDE) {
         $project{"WXMSW_HEADERS"} .= "msw/" . $file . " "
     }
-    
+
     foreach $file (sort keys %wxHTMLINCLUDE) {
         $project{"WXHTML_HEADERS"} .= "html/" . $file . " "
     }
@@ -223,10 +252,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)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)
 
 top_srcdir = @top_srcdir@
 prefix = @prefix@
@@ -275,6 +305,8 @@ host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
 
+USE_GUI=@USE_GUI@
+
 ############################# Dirs #################################
 
 WXDIR = $(top_srcdir)
@@ -288,10 +320,12 @@ HTMLDIR  = $(WXDIR)/src/html
 UNIXDIR  = $(WXDIR)/src/unix
 PNGDIR   = $(WXDIR)/src/png
 JPEGDIR  = $(WXDIR)/src/jpeg
+TIFFDIR  = $(WXDIR)/src/tiff
 ZLIBDIR  = $(WXDIR)/src/zlib
 GTKDIR   = $(WXDIR)/src/gtk
 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
+PMDIR    = $(WXDIR)/src/os2
 ODBCDIR  = $(WXDIR)/src/iodbc
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
@@ -303,6 +337,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 ##################################
@@ -322,6 +357,9 @@ MOTIF_HEADERS = \
 MSW_HEADERS = \
 		#$ ExpandList("WXMSW_HEADERS");
 
+PM_HEADERS = \
+		#$ ExpandList("WXOS2PM_HEADERS");
+
 UNIX_HEADERS = \
 		#$ ExpandList("WXUNIX_HEADERS");
 
@@ -396,6 +434,26 @@ MSW_GUIOBJS = \
 MSW_GUIDEPS = \
 		#$ ExpandList("WXMSW_GUIDEPS");
 
+PM_GENERICOBJS = \
+		#$ ExpandList("WXOS2PM_GENERICOBJS");
+
+PM_GENERICDEPS = \
+		#$ ExpandList("WXOS2PM_GENERICDEPS");
+
+PM_COMMONOBJS = \
+		parser.o \
+		#$ ExpandList("WXOS2PM_COMMONOBJS");
+
+PM_COMMONDEPS = \
+		parser.d \
+		#$ ExpandList("WXOS2PM_COMMONDEPS");
+
+PM_GUIOBJS = \
+		#$ ExpandList("WXOS2PM_GUIOBJS");
+
+PM_GUIDEPS = \
+		#$ ExpandList("WXOS2PM_GUIDEPS");
+
 BASE_OBJS = \
 		#$ ExpandList("BASE_OBJS");
 
@@ -496,6 +554,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 \
@@ -530,6 +623,8 @@ DEPFILES = @ALL_DEPFILES@
 
 HEADERS = @ALL_HEADERS@
 
+BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
+
 all: @WX_ALL@
 
 @WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
@@ -539,7 +634,7 @@ all: @WX_ALL@
 
 @WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
 	@$(INSTALL) -d ./lib
-	$(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
+	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
 	
 CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
 	@$(RM) ./lib/@WX_LIBRARY_LINK1@
@@ -574,14 +669,22 @@ parser.c:	$(COMMDIR)/parser.y lexer.c
 
 lexer.c:	$(COMMDIR)/lexer.l
 	$(LEX) $(COMMDIR)/lexer.l
-	@sed -e "s;$(COMMDIR)/lex.yy.c;lexer.l;g" < lex.yy.c | \
+	@sed -e "s;$(COMMDIR)/@LEX_STEM@.c;lexer.l;g" < @LEX_STEM@.c | \
 	sed -e "s/yy/PROIO_yy/g"            | \
 	sed -e "s/input/PROIO_input/g"      | \
 	sed -e "s/unput/PROIO_unput/g"      > lexer.c
-	@$(RM) lex.yy.c
+	@$(RM) @LEX_STEM@.c
 
 -include $(DEPFILES)
 
+afminstall:
+	$(INSTALL) -d $(datadir)
+	$(INSTALL) -d $(datadir)/wx
+	$(INSTALL) -d $(datadir)/wx/afm
+	$(INSTALL) -d $(datadir)/wx/gs_afm
+	$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
+	$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
+	
 preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
 	@echo " "
 	@echo " Installing wxWindows..."
@@ -590,7 +693,6 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
 	$(INSTALL) -d $(prefix)
 	$(INSTALL) -d $(bindir)
 	$(INSTALL) -d $(libdir)
-	$(INSTALL) -d $(datadir)
 
 	$(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
 	$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
@@ -601,25 +703,17 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
 	$(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
 	$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
 	
-	$(INSTALL) -d $(datadir)/wx
-	$(INSTALL) -d $(datadir)/wx/afm
-	$(INSTALL) -d $(datadir)/wx/gs_afm
-	$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
-	$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
-	
 	$(INSTALL) -d $(includedir)/wx
-	$(INSTALL) -d $(includedir)/wx/msw
-	$(INSTALL) -d $(includedir)/wx/gtk
-	$(INSTALL) -d $(includedir)/wx/motif
-	$(INSTALL) -d $(includedir)/wx/html
-	$(INSTALL) -d $(includedir)/wx/protocol
-	$(INSTALL) -d $(includedir)/wx/unix
-	$(INSTALL) -d $(includedir)/wx/generic
+	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
+	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
+	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/protocol; fi
+	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/unix; fi
+	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
 	@list='$(HEADERS)'; for p in $$list; do \
 	  $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
 	  echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
 	done
-	
+
 write_message:
 	@echo " "
 	@echo " The installation of wxWindows is finished.  On certain"
@@ -632,7 +726,7 @@ write_message:
 	@echo " Read the wxWindows Licence on licencing conditions."
 	@echo " "
 
-install: preinstall @WX_ALL_INSTALLED@ write_message
+install: preinstall @AFMINSTALL@ @WX_ALL_INSTALLED@ write_message
 
 uninstall:
 	@echo " "
@@ -697,6 +791,7 @@ ALL_DIST:
 	mkdir $(DISTDIR)/include/wx/unix
 	mkdir $(DISTDIR)/include/wx/protocol
 	cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx 
+	cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx 
 	cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
 	cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
 	cp $(INCDIR)/wx/generic/*.xpm $(DISTDIR)/include/wx/generic
@@ -712,6 +807,7 @@ ALL_DIST:
 	mkdir $(DISTDIR)/src/unix
 	mkdir $(DISTDIR)/src/png
 	mkdir $(DISTDIR)/src/jpeg
+	mkdir $(DISTDIR)/src/tiff
 	mkdir $(DISTDIR)/src/zlib
 	mkdir $(DISTDIR)/src/iodbc
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
@@ -735,6 +831,9 @@ ALL_DIST:
 	cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
 	cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
 	cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
+	cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff
+	cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff
+	cp $(TIFFDIR)/README $(DISTDIR)/src/tiff
 	cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
 	cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc
 	cp $(ODBCDIR)/*.ci $(DISTDIR)/src/iodbc
@@ -777,76 +876,129 @@ 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/calendar
+	cp $(SAMPDIR)/calendar/Makefile.in $(DISTDIR)/samples/calendar
+	cp $(SAMPDIR)/calendar/makefile.unx $(DISTDIR)/samples/calendar
+	cp $(SAMPDIR)/calendar/*.cpp $(DISTDIR)/samples/calendar
+	
 	mkdir $(DISTDIR)/samples/config
 	cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config
+	cp $(SAMPDIR)/config/makefile.unx $(DISTDIR)/samples/config
 	cp $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config
+	
+	mkdir $(DISTDIR)/samples/console
+	cp $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console
+	cp $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
+	cp $(SAMPDIR)/console/*.cpp $(DISTDIR)/samples/console
+	
 	mkdir $(DISTDIR)/samples/controls
 	mkdir $(DISTDIR)/samples/controls/icons
 	cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls
+	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/*.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/*.h $(DISTDIR)/samples/forty
 	cp $(SAMPDIR)/forty/*.cpp $(DISTDIR)/samples/forty
 	cp $(SAMPDIR)/forty/*.xpm $(DISTDIR)/samples/forty
 	cp $(SAMPDIR)/forty/*.xbm $(DISTDIR)/samples/forty
+	
+	mkdir $(DISTDIR)/samples/font
+	cp $(SAMPDIR)/font/Makefile.in $(DISTDIR)/samples/font
+	cp $(SAMPDIR)/font/makefile.unx $(DISTDIR)/samples/font
+	cp $(SAMPDIR)/font/*.cpp $(DISTDIR)/samples/font
+	
 	mkdir $(DISTDIR)/samples/fractal
 	cp $(SAMPDIR)/fractal/Makefile.in $(DISTDIR)/samples/fractal
+	cp $(SAMPDIR)/fractal/makefile.unx $(DISTDIR)/samples/fractal
 	cp $(SAMPDIR)/fractal/*.cpp $(DISTDIR)/samples/fractal
+	
+	mkdir $(DISTDIR)/samples/grid
+	cp $(SAMPDIR)/grid/Makefile.in $(DISTDIR)/samples/grid
+	cp $(SAMPDIR)/grid/makefile.unx $(DISTDIR)/samples/grid
+	cp $(SAMPDIR)/grid/*.cpp $(DISTDIR)/samples/grid
+	
+	mkdir $(DISTDIR)/samples/help
+	mkdir $(DISTDIR)/samples/help/doc
+	cp $(SAMPDIR)/help/Makefile.in $(DISTDIR)/samples/help
+	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
@@ -860,6 +1012,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
@@ -884,14 +1040,19 @@ 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
+	cp $(SAMPDIR)/image/smile.xbm $(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
@@ -900,56 +1061,104 @@ 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/life
+	mkdir $(DISTDIR)/samples/life/bitmaps
+	cp $(SAMPDIR)/life/Makefile.in $(DISTDIR)/samples/life
+	cp $(SAMPDIR)/life/makefile.unx $(DISTDIR)/samples/life
+	cp $(SAMPDIR)/life/*.cpp $(DISTDIR)/samples/life
+	cp $(SAMPDIR)/life/*.xpm $(DISTDIR)/samples/life
+	cp $(SAMPDIR)/life/bitmaps/*.xpm $(DISTDIR)/samples/life/bitmaps
+	
 	mkdir $(DISTDIR)/samples/listctrl
+	mkdir $(DISTDIR)/samples/listctrl/bitmaps
 	cp $(SAMPDIR)/listctrl/Makefile.in $(DISTDIR)/samples/listctrl
+	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/makefile.unx $(DISTDIR)/samples/nettest
 	cp $(SAMPDIR)/nettest/*.cpp $(DISTDIR)/samples/nettest
+	
 	mkdir $(DISTDIR)/samples/newgrid
 	cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid
+	cp $(SAMPDIR)/newgrid/makefile.unx $(DISTDIR)/samples/newgrid
 	cp $(SAMPDIR)/newgrid/*.cpp $(DISTDIR)/samples/newgrid
 	cp $(SAMPDIR)/newgrid/*.h $(DISTDIR)/samples/newgrid
+	
 	mkdir $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
+	cp $(SAMPDIR)/notebook/makefile.unx $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/*.cpp $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/*.h $(DISTDIR)/samples/notebook
+	
 	mkdir $(DISTDIR)/samples/png
 	cp $(SAMPDIR)/png/Makefile.in $(DISTDIR)/samples/png
+	cp $(SAMPDIR)/png/makefile.unx $(DISTDIR)/samples/png
 	cp $(SAMPDIR)/png/*.cpp $(DISTDIR)/samples/png
 	cp $(SAMPDIR)/png/*.h $(DISTDIR)/samples/png
 	cp $(SAMPDIR)/png/*.png $(DISTDIR)/samples/png
+	
+	mkdir $(DISTDIR)/samples/printing
+	cp $(SAMPDIR)/printing/Makefile.in $(DISTDIR)/samples/printing
+	cp $(SAMPDIR)/printing/makefile.unx $(DISTDIR)/samples/printing
+	cp $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing
+	cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
+	cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
+	cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
+	
 	mkdir $(DISTDIR)/samples/resource
 	cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
+	cp $(SAMPDIR)/resource/makefile.unx $(DISTDIR)/samples/resource
 	cp $(SAMPDIR)/resource/*.cpp $(DISTDIR)/samples/resource
 	cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource
 	cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource
+	
 	mkdir $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/*.cpp $(DISTDIR)/samples/richedit
@@ -957,62 +1166,85 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/richedit/*.xpm $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit
+    
 	mkdir $(DISTDIR)/samples/proplist
 	cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist
 	cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist
 	cp $(SAMPDIR)/proplist/*.h $(DISTDIR)/samples/proplist
+    
+	mkdir $(DISTDIR)/samples/propsize
+	cp $(SAMPDIR)/propsize/Makefile.in $(DISTDIR)/samples/propsize
+	cp $(SAMPDIR)/propsize/*.cpp $(DISTDIR)/samples/propsize
+	cp $(SAMPDIR)/propsize/*.xpm $(DISTDIR)/samples/propsize
+    
 	mkdir $(DISTDIR)/samples/sashtest
 	cp $(SAMPDIR)/sashtest/Makefile.in $(DISTDIR)/samples/sashtest
 	cp $(SAMPDIR)/sashtest/*.cpp $(DISTDIR)/samples/sashtest
 	cp $(SAMPDIR)/sashtest/*.h $(DISTDIR)/samples/sashtest
+    
 	mkdir $(DISTDIR)/samples/scroll
 	cp $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll
+	cp $(SAMPDIR)/scroll/makefile.unx $(DISTDIR)/samples/scroll
 	cp $(SAMPDIR)/scroll/*.cpp $(DISTDIR)/samples/scroll
+    
 	mkdir $(DISTDIR)/samples/scrollsub
 	cp $(SAMPDIR)/scrollsub/Makefile.in $(DISTDIR)/samples/scrollsub
+	cp $(SAMPDIR)/scrollsub/makefile.unx $(DISTDIR)/samples/scrollsub
 	cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub
+    
 	mkdir $(DISTDIR)/samples/splitter
+	cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter
+    
 	mkdir $(DISTDIR)/samples/text
 	cp $(SAMPDIR)/text/Makefile.in $(DISTDIR)/samples/text
+	cp $(SAMPDIR)/text/makefile.unx $(DISTDIR)/samples/text
 	cp $(SAMPDIR)/text/*.cpp $(DISTDIR)/samples/text
 	cp $(SAMPDIR)/text/*.xpm $(DISTDIR)/samples/text
+    
 	mkdir $(DISTDIR)/samples/thread
 	cp $(SAMPDIR)/thread/Makefile.in $(DISTDIR)/samples/thread
+	cp $(SAMPDIR)/thread/makefile.unx $(DISTDIR)/samples/thread
 	cp $(SAMPDIR)/thread/*.cpp $(DISTDIR)/samples/thread
+    
 	mkdir $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/Makefile.in $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/*.cpp $(DISTDIR)/samples/toolbar
-	cp $(SAMPDIR)/toolbar/*.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
+    
 	mkdir $(DISTDIR)/samples/treectrl
 	cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl
 	cp $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl
 	cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl
 	cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl
+    
 	mkdir $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/*.cpp $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/*.h $(DISTDIR)/samples/typetest
 	cp $(SAMPDIR)/typetest/*.xpm $(DISTDIR)/samples/typetest
+    
 	mkdir $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/Makefile.in $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/*.cpp $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/*.h $(DISTDIR)/samples/validate
 	cp $(SAMPDIR)/validate/*.xpm $(DISTDIR)/samples/validate
+    
 	mkdir $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/Makefile.in $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard
 	cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard
+    
 	mkdir $(DISTDIR)/samples/wxpoem
 	cp $(SAMPDIR)/wxpoem/Makefile.in $(DISTDIR)/samples/wxpoem
 	cp $(SAMPDIR)/wxpoem/*.cpp $(DISTDIR)/samples/wxpoem
 	cp $(SAMPDIR)/wxpoem/*.xpm $(DISTDIR)/samples/wxpoem
 	cp $(SAMPDIR)/wxpoem/*.dat $(DISTDIR)/samples/wxpoem
 	cp $(SAMPDIR)/wxpoem/*.txt $(DISTDIR)/samples/wxpoem
+    
 	mkdir $(DISTDIR)/samples/wxsocket
 	cp $(SAMPDIR)/wxsocket/Makefile.in $(DISTDIR)/samples/wxsocket
 	cp $(SAMPDIR)/wxsocket/*.cpp $(DISTDIR)/samples/wxsocket
@@ -1057,6 +1289,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: