wxCmdLineParser tests

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 50a848d8e3225eddba749637418c83eae01f19ea..962e8a9924179707004bf0d1a35ae3f85b88c7a4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 13:22, 1999/11/24
+# This file was automatically generated by tmake at 17:48, 2000/01/03
 # 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@
@@ -108,6 +109,7 @@ 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
@@ -131,8 +133,10 @@ DISTDIR = ./_dist_dir/wx$(TOOLKIT)
 BASE_HEADERS = \
                app.h \
                date.h \
+               datetime.h \
                debug.h \
                defs.h \
+               dir.h \
                dynarray.h \
                dynlib.h \
                event.h \
@@ -175,6 +179,7 @@ WX_HEADERS = \
                buffer.h \
                busyinfo.h \
                button.h \
+               calctrl.h \
                caret.h \
                checkbox.h \
                checklst.h \
@@ -192,6 +197,7 @@ WX_HEADERS = \
                cursor.h \
                dataobj.h \
                date.h \
+               datetime.h \
                datstrm.h \
                db.h \
                dbtable.h \
@@ -206,6 +212,7 @@ WX_HEADERS = \
                defs.h \
                dialog.h \
                dialup.h \
+               dir.h \
                dirdlg.h \
                dnd.h \
                docmdi.h \
@@ -213,6 +220,7 @@ WX_HEADERS = \
                dragimag.h \
                dynarray.h \
                dynlib.h \
+               encconv.h \
                event.h \
                expr.h \
                ffile.h \
@@ -242,8 +250,15 @@ WX_HEADERS = \
                helpwin.h \
                helpxlp.h \
                icon.h \
+               imagbmp.h \
                image.h \
+               imaggif.h \
+               imagjpeg.h \
                imaglist.h \
+               imagpcx.h \
+               imagpng.h \
+               imagpnm.h \
+               imagtiff.h \
                intl.h \
                ioswrap.h \
                ipcbase.h \
@@ -276,7 +291,6 @@ WX_HEADERS = \
                panel.h \
                paper.h \
                pen.h \
-               pnghand.h \
                print.h \
                printdlg.h \
                prntbase.h \
@@ -315,9 +329,7 @@ WX_HEADERS = \
                tab.h \
                tabctrl.h \
                taskbar.h \
-               tbar95.h \
                tbarbase.h \
-               tbarmsw.h \
                tbarsmpl.h \
                textctrl.h \
                textdlg.h \
@@ -533,8 +545,6 @@ MSW_HEADERS = \
                msw/notebook.h \
                msw/palette.h \
                msw/pen.h \
-               msw/pnghand.h \
-               msw/pngread.h \
                msw/printdlg.h \
                msw/printwin.h \
                msw/private.h \
@@ -573,6 +583,7 @@ UNIX_HEADERS = \
                unix/fontutil.h
 
 GENERIC_HEADERS = \
+               generic/calctrl.h \
                generic/caret.h \
                generic/choicdgg.h \
                generic/colrdlgg.h \
@@ -601,7 +612,8 @@ GENERIC_HEADERS = \
                generic/statusbr.h \
                generic/tabg.h \
                generic/textdlgg.h \
-               generic/treectrl.h
+               generic/treectrl.h \
+               generic/wizard.h
 
 PROTOCOL_HEADERS = \
                protocol/file.h \
@@ -626,6 +638,7 @@ HTML_HEADERS = \
 
 GTK_GENERICOBJS = \
                busyinfo.o \
+               calctrl.o \
                caret.o \
                choicdgg.o \
                colrdlgg.o \
@@ -654,6 +667,7 @@ GTK_GENERICOBJS = \
                splitter.o \
                statusbr.o \
                tabg.o \
+               tbarsmpl.o \
                textdlgg.o \
                tipdlg.o \
                treectrl.o \
@@ -661,6 +675,7 @@ GTK_GENERICOBJS = \
 
 GTK_GENERICDEPS = \
                busyinfo.d \
+               calctrl.d \
                caret.d \
                choicdgg.d \
                colrdlgg.d \
@@ -689,6 +704,7 @@ GTK_GENERICDEPS = \
                splitter.d \
                statusbr.d \
                tabg.d \
+               tbarsmpl.d \
                textdlgg.d \
                tipdlg.d \
                treectrl.d \
@@ -703,7 +719,7 @@ GTK_COMMONOBJS = \
                config.o \
                ctrlcmn.o \
                ctrlsub.o \
-               date.o \
+               datetime.o \
                datstrm.o \
                db.o \
                dbtable.o \
@@ -714,6 +730,7 @@ GTK_COMMONOBJS = \
                docview.o \
                dynarray.o \
                dynlib.o \
+               encconv.o \
                event.o \
                extended.o \
                ffile.o \
@@ -740,12 +757,14 @@ GTK_COMMONOBJS = \
                imagpcx.o \
                imagpng.o \
                imagpnm.o \
+               imagtiff.o \
                intl.o \
                ipcbase.o \
                layout.o \
                lboxcmn.o \
                list.o \
                log.o \
+               longlong.o \
                memory.o \
                menucmn.o \
                mimetype.o \
@@ -769,10 +788,8 @@ GTK_COMMONOBJS = \
                stream.o \
                string.o \
                tbarbase.o \
-               tbarsmpl.o \
                textcmn.o \
                textfile.o \
-               time.o \
                timercmn.o \
                tokenzr.o \
                txtstrm.o \
@@ -799,7 +816,7 @@ GTK_COMMONDEPS = \
                config.d \
                ctrlcmn.d \
                ctrlsub.d \
-               date.d \
+               datetime.d \
                datstrm.d \
                db.d \
                dbtable.d \
@@ -810,6 +827,7 @@ GTK_COMMONDEPS = \
                docview.d \
                dynarray.d \
                dynlib.d \
+               encconv.d \
                event.d \
                extended.d \
                ffile.d \
@@ -836,12 +854,14 @@ GTK_COMMONDEPS = \
                imagpcx.d \
                imagpng.d \
                imagpnm.d \
+               imagtiff.d \
                intl.d \
                ipcbase.d \
                layout.d \
                lboxcmn.d \
                list.d \
                log.d \
+               longlong.d \
                memory.d \
                menucmn.d \
                mimetype.d \
@@ -865,10 +885,8 @@ GTK_COMMONDEPS = \
                stream.d \
                string.d \
                tbarbase.d \
-               tbarsmpl.d \
                textcmn.d \
                textfile.d \
-               time.d \
                timercmn.d \
                tokenzr.d \
                txtstrm.d \
@@ -1008,6 +1026,7 @@ GTK_GUIDEPS = \
 
 MOTIF_GENERICOBJS = \
                busyinfo.o \
+               calctrl.o \
                caret.o \
                choicdgg.o \
                colrdlgg.o \
@@ -1039,6 +1058,7 @@ MOTIF_GENERICOBJS = \
                statline.o \
                statusbr.o \
                tabg.o \
+               tbarsmpl.o \
                textdlgg.o \
                tipdlg.o \
                treectrl.o \
@@ -1046,6 +1066,7 @@ MOTIF_GENERICOBJS = \
 
 MOTIF_GENERICDEPS = \
                busyinfo.d \
+               calctrl.d \
                caret.d \
                choicdgg.d \
                colrdlgg.d \
@@ -1077,6 +1098,7 @@ MOTIF_GENERICDEPS = \
                statline.d \
                statusbr.d \
                tabg.d \
+               tbarsmpl.d \
                textdlgg.d \
                tipdlg.d \
                treectrl.d \
@@ -1091,7 +1113,7 @@ MOTIF_COMMONOBJS = \
                config.o \
                ctrlcmn.o \
                ctrlsub.o \
-               date.o \
+               datetime.o \
                datstrm.o \
                db.o \
                dbtable.o \
@@ -1102,6 +1124,7 @@ MOTIF_COMMONOBJS = \
                docview.o \
                dynarray.o \
                dynlib.o \
+               encconv.o \
                event.o \
                extended.o \
                ffile.o \
@@ -1128,12 +1151,14 @@ MOTIF_COMMONOBJS = \
                imagpcx.o \
                imagpng.o \
                imagpnm.o \
+               imagtiff.o \
                intl.o \
                ipcbase.o \
                layout.o \
                lboxcmn.o \
                list.o \
                log.o \
+               longlong.o \
                memory.o \
                menucmn.o \
                mimetype.o \
@@ -1157,10 +1182,8 @@ MOTIF_COMMONOBJS = \
                stream.o \
                string.o \
                tbarbase.o \
-               tbarsmpl.o \
                textcmn.o \
                textfile.o \
-               time.o \
                timercmn.o \
                tokenzr.o \
                txtstrm.o \
@@ -1187,7 +1210,7 @@ MOTIF_COMMONDEPS = \
                config.d \
                ctrlcmn.d \
                ctrlsub.d \
-               date.d \
+               datetime.d \
                datstrm.d \
                db.d \
                dbtable.d \
@@ -1198,6 +1221,7 @@ MOTIF_COMMONDEPS = \
                docview.d \
                dynarray.d \
                dynlib.d \
+               encconv.d \
                event.d \
                extended.d \
                ffile.d \
@@ -1224,12 +1248,14 @@ MOTIF_COMMONDEPS = \
                imagpcx.d \
                imagpng.d \
                imagpnm.d \
+               imagtiff.d \
                intl.d \
                ipcbase.d \
                layout.d \
                lboxcmn.d \
                list.d \
                log.d \
+               longlong.d \
                memory.d \
                menucmn.d \
                mimetype.d \
@@ -1253,10 +1279,8 @@ MOTIF_COMMONDEPS = \
                stream.d \
                string.d \
                tbarbase.d \
-               tbarsmpl.d \
                textcmn.d \
                textfile.d \
-               time.d \
                timercmn.d \
                tokenzr.d \
                txtstrm.d \
@@ -1386,6 +1410,7 @@ MOTIF_GUIDEPS = \
 
 MSW_GENERICOBJS = \
                busyinfo.o \
+               calctrl.o \
                choicdgg.o \
                dirdlgg.o \
                grid.o \
@@ -1401,13 +1426,14 @@ MSW_GENERICOBJS = \
                scrolwin.o \
                splitter.o \
                statusbr.o \
-               tabg.o \
+               tbarsmpl.o \
                textdlgg.o \
                tipdlg.o \
                wizard.o
 
 MSW_GENERICDEPS = \
                busyinfo.d \
+               calctrl.d \
                choicdgg.d \
                dirdlgg.d \
                grid.d \
@@ -1423,7 +1449,7 @@ MSW_GENERICDEPS = \
                scrolwin.d \
                splitter.d \
                statusbr.d \
-               tabg.d \
+               tbarsmpl.d \
                textdlgg.d \
                tipdlg.d \
                wizard.d
@@ -1437,7 +1463,7 @@ MSW_COMMONOBJS = \
                config.o \
                ctrlcmn.o \
                ctrlsub.o \
-               date.o \
+               datetime.o \
                datstrm.o \
                db.o \
                dbtable.o \
@@ -1448,6 +1474,7 @@ MSW_COMMONOBJS = \
                docview.o \
                dynarray.o \
                dynlib.o \
+               encconv.o \
                event.o \
                extended.o \
                ffile.o \
@@ -1474,12 +1501,14 @@ MSW_COMMONOBJS = \
                imagpcx.o \
                imagpng.o \
                imagpnm.o \
+               imagtiff.o \
                intl.o \
                ipcbase.o \
                layout.o \
                lboxcmn.o \
                list.o \
                log.o \
+               longlong.o \
                memory.o \
                menucmn.o \
                mimetype.o \
@@ -1504,10 +1533,8 @@ MSW_COMMONOBJS = \
                stream.o \
                string.o \
                tbarbase.o \
-               tbarsmpl.o \
                textcmn.o \
                textfile.o \
-               time.o \
                timercmn.o \
                tokenzr.o \
                txtstrm.o \
@@ -1534,7 +1561,7 @@ MSW_COMMONDEPS = \
                config.d \
                ctrlcmn.d \
                ctrlsub.d \
-               date.d \
+               datetime.d \
                datstrm.d \
                db.d \
                dbtable.d \
@@ -1545,6 +1572,7 @@ MSW_COMMONDEPS = \
                docview.d \
                dynarray.d \
                dynlib.d \
+               encconv.d \
                event.d \
                extended.d \
                ffile.d \
@@ -1571,12 +1599,14 @@ MSW_COMMONDEPS = \
                imagpcx.d \
                imagpng.d \
                imagpnm.d \
+               imagtiff.d \
                intl.d \
                ipcbase.d \
                layout.d \
                lboxcmn.d \
                list.d \
                log.d \
+               longlong.d \
                memory.d \
                menucmn.d \
                mimetype.d \
@@ -1601,10 +1631,8 @@ MSW_COMMONDEPS = \
                stream.d \
                string.d \
                tbarbase.d \
-               tbarsmpl.d \
                textcmn.d \
                textfile.d \
-               time.d \
                timercmn.d \
                tokenzr.d \
                txtstrm.d \
@@ -1648,8 +1676,10 @@ MSW_GUIOBJS = \
                dcscreen.o \
                dde.o \
                dialog.o \
+               dialup.o \
                dib.o \
                dibutils.o \
+               dir.o \
                dragimag.o \
                filedlg.o \
                font.o \
@@ -1680,7 +1710,6 @@ MSW_GUIOBJS = \
                palette.o \
                pen.o \
                penwin.o \
-               pnghand.o \
                printdlg.o \
                printwin.o \
                radiobox.o \
@@ -1738,8 +1767,10 @@ MSW_GUIDEPS = \
                dcscreen.d \
                dde.d \
                dialog.d \
+               dialup.d \
                dib.d \
                dibutils.d \
+               dir.d \
                dragimag.d \
                filedlg.d \
                font.d \
@@ -1770,7 +1801,6 @@ MSW_GUIDEPS = \
                palette.d \
                pen.d \
                penwin.d \
-               pnghand.d \
                printdlg.d \
                printwin.d \
                radiobox.d \
@@ -1806,7 +1836,7 @@ BASE_OBJS = \
                init.o \
                appcmn.o \
                config.o \
-               date.o \
+               datetime.o \
                dynarray.o \
                dynlib.o \
                event.o \
@@ -1820,6 +1850,7 @@ BASE_OBJS = \
                intl.o \
                list.o \
                log.o \
+               longlong.o \
                mimetype.o \
                module.o \
                object.o \
@@ -1828,20 +1859,21 @@ BASE_OBJS = \
                stream.o \
                string.o \
                textfile.o \
-               time.o \
                timercmn.o \
                tokenzr.o \
                txtstrm.o \
                utilscmn.o \
                variant.o \
                wxchar.o \
+               dir.o \
+               threadpsx.o \
                utilsunx.o
 
 BASE_DEPS = \
                init.d \
                appcmn.d \
                config.d \
-               date.d \
+               datetime.d \
                dynarray.d \
                dynlib.d \
                event.d \
@@ -1855,6 +1887,7 @@ BASE_DEPS = \
                intl.d \
                list.d \
                log.d \
+               longlong.d \
                mimetype.d \
                module.d \
                object.d \
@@ -1863,13 +1896,14 @@ BASE_DEPS = \
                stream.d \
                string.d \
                textfile.d \
-               time.d \
                timercmn.d \
                tokenzr.d \
                txtstrm.d \
                utilscmn.d \
                variant.d \
                wxchar.d \
+               dir.d \
+               threadpsx.d \
                utilsunx.d
 
 HTMLOBJS = \
@@ -1882,6 +1916,7 @@ HTMLOBJS = \
                htmltag.o \
                htmlwin.o \
                htmprint.o \
+               m_dflist.o \
                m_fonts.o \
                m_hline.o \
                m_image.o \
@@ -1902,6 +1937,7 @@ HTMLDEPS = \
                htmltag.d \
                htmlwin.d \
                htmprint.d \
+               m_dflist.d \
                m_fonts.d \
                m_hline.d \
                m_image.d \
@@ -1914,6 +1950,7 @@ HTMLDEPS = \
 
 UNIX_OBJS = \
                dialup.o \
+               dir.o \
                fontenum.o \
                fontutil.o \
                gsocket.o \
@@ -1922,6 +1959,7 @@ UNIX_OBJS = \
 
 UNIX_DEPS = \
                dialup.d \
+               dir.d \
                fontenum.d \
                fontutil.d \
                gsocket.d \
@@ -2010,6 +2048,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 \
@@ -2044,6 +2117,8 @@ DEPFILES = @ALL_DEPFILES@
 
 HEADERS = @ALL_HEADERS@
 
+BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
+
 all: @WX_ALL@
 
 @WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
@@ -2053,7 +2128,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@
@@ -2211,6 +2286,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
@@ -2226,6 +2302,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
@@ -2249,6 +2326,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
@@ -2306,11 +2386,21 @@ SAMPLES_DIST:
        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
@@ -2325,14 +2415,6 @@ SAMPLES_DIST:
        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
@@ -2384,15 +2466,26 @@ SAMPLES_DIST:
        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
@@ -2448,7 +2541,8 @@ SAMPLES_DIST:
        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
@@ -2469,6 +2563,14 @@ SAMPLES_DIST:
        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
@@ -2515,26 +2617,39 @@ SAMPLES_DIST:
        
        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
@@ -2546,65 +2661,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/*.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