]> git.saurik.com Git - wxWidgets.git/blobdiff - Makefile.in
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added helpview to makefile
[wxWidgets.git] / Makefile.in
diff --git a/Makefile.in b/Makefile.in
index c09276bee6d3625272add9f0ead31fbff4e18e57..8d4b38b8d90196473b91f4fe23d454037d8c52e3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 01:34, 2000/01/14
+# This file was automatically generated by tmake at 23:25, 2000/01/24
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -123,6 +123,7 @@ PMDIR    = $(WXDIR)/src/os2
 ODBCDIR  = $(WXDIR)/src/iodbc
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
+DEMODIR  = $(WXDIR)/demos
 UTILSDIR = $(WXDIR)/utils
 MISCDIR  = $(WXDIR)/misc
 
@@ -132,6 +133,7 @@ DOCDIR = $(WXDIR)/docs
 
 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
+WXDEMOS = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
 DISTDIR = ./_dist_dir/wx$(TOOLKIT)
 
 ############################## Files ##################################
@@ -142,6 +144,7 @@ BASE_HEADERS = \
                cmdline.h \
                date.h \
                datetime.h \
+               datetime.inl \
                debug.h \
                defs.h \
                dir.h \
@@ -157,6 +160,7 @@ BASE_HEADERS = \
                list.h \
                log.h \
                longlong.h \
+               memconf.h \
                memory.h \
                mimetype.h \
                module.h \
@@ -209,6 +213,7 @@ WX_HEADERS = \
                dataobj.h \
                date.h \
                datetime.h \
+               datetime.inl \
                datstrm.h \
                db.h \
                dbtable.h \
@@ -251,6 +256,7 @@ WX_HEADERS = \
                gauge.h \
                gdicmn.h \
                gdiobj.h \
+               geometry.h \
                gifdecod.h \
                grid.h \
                gsocket.h \
@@ -284,6 +290,7 @@ WX_HEADERS = \
                longlong.h \
                matrix.h \
                mdi.h \
+               memconf.h \
                memory.h \
                menu.h \
                menuitem.h \
@@ -302,6 +309,7 @@ WX_HEADERS = \
                panel.h \
                paper.h \
                pen.h \
+               plot.h \
                print.h \
                printdlg.h \
                prntbase.h \
@@ -666,7 +674,9 @@ PM_HEADERS = \
 
 UNIX_HEADERS = \
                unix/execute.h \
-               unix/fontutil.h
+               unix/fontutil.h \
+               unix/gsockunx.h \
+               unix/mimetype.h
 
 GENERIC_HEADERS = \
                generic/calctrl.h \
@@ -689,6 +699,7 @@ GENERIC_HEADERS = \
                generic/msgdlgg.h \
                generic/notebook.h \
                generic/panelg.h \
+               generic/plot.h \
                generic/printps.h \
                generic/prntdlgg.h \
                generic/progdlgg.h \
@@ -742,6 +753,7 @@ GTK_GENERICOBJS = \
                msgdlgg.o \
                numdlgg.o \
                panelg.o \
+               plot.o \
                printps.o \
                prntdlgg.o \
                progdlgg.o \
@@ -779,6 +791,7 @@ GTK_GENERICDEPS = \
                msgdlgg.d \
                numdlgg.d \
                panelg.d \
+               plot.d \
                printps.d \
                prntdlgg.d \
                progdlgg.d \
@@ -812,6 +825,7 @@ GTK_COMMONOBJS = \
                dbtable.o \
                dcbase.o \
                dlgcmn.o \
+               dndcmn.o \
                dobjcmn.o \
                docmdi.o \
                docview.o \
@@ -832,6 +846,7 @@ GTK_COMMONOBJS = \
                fs_zip.o \
                ftp.o \
                gdicmn.o \
+               geometry.o \
                gifdecod.o \
                hash.o \
                helpbase.o \
@@ -854,7 +869,7 @@ GTK_COMMONOBJS = \
                longlong.o \
                memory.o \
                menucmn.o \
-               mimetype.o \
+               mimecmn.o \
                module.o \
                mstream.o \
                object.o \
@@ -910,6 +925,7 @@ GTK_COMMONDEPS = \
                dbtable.d \
                dcbase.d \
                dlgcmn.d \
+               dndcmn.d \
                dobjcmn.d \
                docmdi.d \
                docview.d \
@@ -930,6 +946,7 @@ GTK_COMMONDEPS = \
                fs_zip.d \
                ftp.d \
                gdicmn.d \
+               geometry.d \
                gifdecod.d \
                hash.d \
                helpbase.d \
@@ -952,7 +969,7 @@ GTK_COMMONDEPS = \
                longlong.d \
                memory.d \
                menucmn.d \
-               mimetype.d \
+               mimecmn.d \
                module.d \
                mstream.d \
                object.d \
@@ -1134,6 +1151,7 @@ MOTIF_GENERICOBJS = \
                notebook.o \
                numdlgg.o \
                panelg.o \
+               plot.o \
                printps.o \
                prntdlgg.o \
                progdlgg.o \
@@ -1174,6 +1192,7 @@ MOTIF_GENERICDEPS = \
                notebook.d \
                numdlgg.d \
                panelg.d \
+               plot.d \
                printps.d \
                prntdlgg.d \
                progdlgg.d \
@@ -1208,6 +1227,7 @@ MOTIF_COMMONOBJS = \
                dbtable.o \
                dcbase.o \
                dlgcmn.o \
+               dndcmn.o \
                dobjcmn.o \
                docmdi.o \
                docview.o \
@@ -1228,6 +1248,7 @@ MOTIF_COMMONOBJS = \
                fs_zip.o \
                ftp.o \
                gdicmn.o \
+               geometry.o \
                gifdecod.o \
                hash.o \
                helpbase.o \
@@ -1250,7 +1271,7 @@ MOTIF_COMMONOBJS = \
                longlong.o \
                memory.o \
                menucmn.o \
-               mimetype.o \
+               mimecmn.o \
                module.o \
                mstream.o \
                object.o \
@@ -1306,6 +1327,7 @@ MOTIF_COMMONDEPS = \
                dbtable.d \
                dcbase.d \
                dlgcmn.d \
+               dndcmn.d \
                dobjcmn.d \
                docmdi.d \
                docview.d \
@@ -1326,6 +1348,7 @@ MOTIF_COMMONDEPS = \
                fs_zip.d \
                ftp.d \
                gdicmn.d \
+               geometry.d \
                gifdecod.d \
                hash.d \
                helpbase.d \
@@ -1348,7 +1371,7 @@ MOTIF_COMMONDEPS = \
                longlong.d \
                memory.d \
                menucmn.d \
-               mimetype.d \
+               mimecmn.d \
                module.d \
                mstream.d \
                object.d \
@@ -1508,6 +1531,7 @@ MSW_GENERICOBJS = \
                logg.o \
                numdlgg.o \
                panelg.o \
+               plot.o \
                progdlgg.o \
                prop.o \
                propform.o \
@@ -1531,6 +1555,7 @@ MSW_GENERICDEPS = \
                logg.d \
                numdlgg.d \
                panelg.d \
+               plot.d \
                progdlgg.d \
                prop.d \
                propform.d \
@@ -1560,6 +1585,7 @@ MSW_COMMONOBJS = \
                dbtable.o \
                dcbase.o \
                dlgcmn.o \
+               dndcmn.o \
                dobjcmn.o \
                docmdi.o \
                docview.o \
@@ -1580,6 +1606,7 @@ MSW_COMMONOBJS = \
                fs_zip.o \
                ftp.o \
                gdicmn.o \
+               geometry.o \
                gifdecod.o \
                hash.o \
                helpbase.o \
@@ -1602,7 +1629,7 @@ MSW_COMMONOBJS = \
                longlong.o \
                memory.o \
                menucmn.o \
-               mimetype.o \
+               mimecmn.o \
                module.o \
                mstream.o \
                object.o \
@@ -1659,6 +1686,7 @@ MSW_COMMONDEPS = \
                dbtable.d \
                dcbase.d \
                dlgcmn.d \
+               dndcmn.d \
                dobjcmn.d \
                docmdi.d \
                docview.d \
@@ -1679,6 +1707,7 @@ MSW_COMMONDEPS = \
                fs_zip.d \
                ftp.d \
                gdicmn.d \
+               geometry.d \
                gifdecod.d \
                hash.d \
                helpbase.d \
@@ -1701,7 +1730,7 @@ MSW_COMMONDEPS = \
                longlong.d \
                memory.d \
                menucmn.d \
-               mimetype.d \
+               mimecmn.d \
                module.d \
                mstream.d \
                object.d \
@@ -1795,6 +1824,7 @@ MSW_GUIOBJS = \
                menu.o \
                menuitem.o \
                metafile.o \
+               mimetype.o \
                minifram.o \
                msgdlg.o \
                nativdlg.o \
@@ -1887,6 +1917,7 @@ MSW_GUIDEPS = \
                menu.d \
                menuitem.d \
                metafile.d \
+               mimetype.d \
                minifram.d \
                msgdlg.d \
                nativdlg.d \
@@ -1945,6 +1976,7 @@ PM_GENERICOBJS = \
                msgdlgg.o \
                numdlgg.o \
                panelg.o \
+               plot.o \
                printps.o \
                prntdlgg.o \
                progdlgg.o \
@@ -1980,6 +2012,7 @@ PM_GENERICDEPS = \
                msgdlgg.d \
                numdlgg.d \
                panelg.d \
+               plot.d \
                printps.d \
                prntdlgg.d \
                progdlgg.d \
@@ -2012,6 +2045,7 @@ PM_COMMONOBJS = \
                dbtable.o \
                dcbase.o \
                dlgcmn.o \
+               dndcmn.o \
                dobjcmn.o \
                docmdi.o \
                docview.o \
@@ -2032,6 +2066,7 @@ PM_COMMONOBJS = \
                fs_zip.o \
                ftp.o \
                gdicmn.o \
+               geometry.o \
                gifdecod.o \
                hash.o \
                helpbase.o \
@@ -2054,7 +2089,7 @@ PM_COMMONOBJS = \
                longlong.o \
                memory.o \
                menucmn.o \
-               mimetype.o \
+               mimecmn.o \
                module.o \
                mstream.o \
                object.o \
@@ -2111,6 +2146,7 @@ PM_COMMONDEPS = \
                dbtable.d \
                dcbase.d \
                dlgcmn.d \
+               dndcmn.d \
                dobjcmn.d \
                docmdi.d \
                docview.d \
@@ -2131,6 +2167,7 @@ PM_COMMONDEPS = \
                fs_zip.d \
                ftp.d \
                gdicmn.d \
+               geometry.d \
                gifdecod.d \
                hash.d \
                helpbase.d \
@@ -2153,7 +2190,7 @@ PM_COMMONDEPS = \
                longlong.d \
                memory.d \
                menucmn.d \
-               mimetype.d \
+               mimecmn.d \
                module.d \
                mstream.d \
                object.d \
@@ -2217,11 +2254,14 @@ PM_GUIOBJS = \
                dcprint.o \
                dcscreen.o \
                dialog.o \
+               dir.o \
                dirdlg.o \
                dnd.o \
                filedlg.o \
                font.o \
                fontdlg.o \
+               fontenum.o \
+               fontutil.o \
                frame.o \
                gauge.o \
                gdiimage.o \
@@ -2237,6 +2277,7 @@ PM_GUIOBJS = \
                menu.o \
                menuitem.o \
                metafile.o \
+               mimetype.o \
                minifram.o \
                msgdlg.o \
                nativdlg.o \
@@ -2292,11 +2333,14 @@ PM_GUIDEPS = \
                dcprint.d \
                dcscreen.d \
                dialog.d \
+               dir.d \
                dirdlg.d \
                dnd.d \
                filedlg.d \
                font.d \
                fontdlg.d \
+               fontenum.d \
+               fontutil.d \
                frame.d \
                gauge.d \
                gdiimage.d \
@@ -2312,6 +2356,7 @@ PM_GUIDEPS = \
                menu.d \
                menuitem.d \
                metafile.d \
+               mimetype.d \
                minifram.d \
                msgdlg.d \
                nativdlg.d \
@@ -2364,7 +2409,7 @@ BASE_OBJS = \
                list.o \
                log.o \
                longlong.o \
-               mimetype.o \
+               mimecmn.o \
                module.o \
                object.o \
                process.o \
@@ -2380,6 +2425,7 @@ BASE_OBJS = \
                wfstream.o \
                wxchar.o \
                dir.o \
+               mimetype.o \
                threadpsx.o \
                utilsunx.o
 
@@ -2403,7 +2449,7 @@ BASE_DEPS = \
                list.d \
                log.d \
                longlong.d \
-               mimetype.d \
+               mimecmn.d \
                module.d \
                object.d \
                process.d \
@@ -2419,6 +2465,7 @@ BASE_DEPS = \
                wfstream.d \
                wxchar.d \
                dir.d \
+               mimetype.d \
                threadpsx.d \
                utilsunx.d
 
@@ -2439,6 +2486,7 @@ HTMLOBJS = \
                m_layout.o \
                m_links.o \
                m_list.o \
+               m_meta.o \
                m_pre.o \
                m_tables.o \
                winpars.o
@@ -2460,6 +2508,7 @@ HTMLDEPS = \
                m_layout.d \
                m_links.d \
                m_list.d \
+               m_meta.d \
                m_pre.d \
                m_tables.d \
                winpars.d
@@ -2470,6 +2519,7 @@ UNIX_OBJS = \
                fontenum.o \
                fontutil.o \
                gsocket.o \
+               mimetype.o \
                threadpsx.o \
                utilsunx.o
 
@@ -2479,6 +2529,7 @@ UNIX_DEPS = \
                fontenum.d \
                fontutil.d \
                gsocket.d \
+               mimetype.d \
                threadpsx.d \
                utilsunx.d
 
@@ -2883,18 +2934,52 @@ MSW_DIST:
        mkdir $(DISTDIR)/src/msw/ole
        cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
 
+DEMOS_DIST:
+       mkdir $(DISTDIR)/demos
+       cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos
+
+       mkdir $(DISTDIR)/demos/bombs
+       cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs
+       cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs
+       cp $(DEMODIR)/bombs/*.cpp $(DISTDIR)/demos/bombs
+       cp $(DEMODIR)/bombs/*.h $(DISTDIR)/demos/bombs
+       cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
+       cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
+       
+       mkdir $(DISTDIR)/demos/forty
+       cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
+       cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty
+       cp $(DEMODIR)/forty/*.h $(DISTDIR)/demos/forty
+       cp $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty
+       cp $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty
+       cp $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty
+       
+       mkdir $(DISTDIR)/demos/life
+       mkdir $(DISTDIR)/demos/life/bitmaps
+       cp $(DEMODIR)/life/Makefile.in $(DISTDIR)/demos/life
+       cp $(DEMODIR)/life/makefile.unx $(DISTDIR)/demos/life
+       cp $(DEMODIR)/life/*.cpp $(DISTDIR)/demos/life
+       cp $(DEMODIR)/life/*.h $(DISTDIR)/demos/life
+       cp $(DEMODIR)/life/*.xpm $(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/*.cpp $(DISTDIR)/demos/poem
+       cp $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem
+       cp $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem
+       cp $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem
+    
+       mkdir $(DISTDIR)/demos/fractal
+       cp $(DEMODIR)/fractal/Makefile.in $(DISTDIR)/demos/fractal
+       cp $(DEMODIR)/fractal/makefile.unx $(DISTDIR)/demos/fractal
+       cp $(DEMODIR)/fractal/*.cpp $(DISTDIR)/demos/fractal
+       
 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
@@ -2978,24 +3063,21 @@ SAMPLES_DIST:
        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/exec
+       cp $(SAMPDIR)/exec/Makefile.in $(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/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
@@ -3057,6 +3139,7 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/image/*.cpp $(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
     
        mkdir $(DISTDIR)/samples/internat
        mkdir $(DISTDIR)/samples/internat/de
@@ -3078,14 +3161,6 @@ 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
@@ -3130,10 +3205,10 @@ SAMPLES_DIST:
        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/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
@@ -3248,17 +3323,10 @@ SAMPLES_DIST:
        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
-       cp $(SAMPDIR)/wxsocket/*.xpm $(DISTDIR)/samples/wxsocket
+       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:
        mkdir $(DISTDIR)/utils
@@ -3297,10 +3365,12 @@ MISC_DIST:
        mkdir $(DISTDIR)/misc/gs_afm
        cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm
        
-dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST
+dist: ALL_DIST @GUIDIST@ SAMPLES_DIST DEMOS_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) ../..
+       mv _dist_dir/wx$(TOOLKIT)/demos _dist_dir/wx$(TOOLKIT)/wxDemos
+       cd _dist_dir/wx$(TOOLKIT); tar ch wxDemos | gzip -f9 > $(WXDEMOS); mv $(WXDEMOS) ../..
        $(RM) -r _dist_dir
 
 clean:
wxWidgets (Impactor)