]> 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
updated the makefile to copy dnd.wxr so that the program can find it,
[wxWidgets.git] / Makefile.in
diff --git a/Makefile.in b/Makefile.in
index 40267b2b4966426aacf46b72fd65f0a909a2ad22..c5ee81b384811dc49f11b738ff37d917096fdfb5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
 #
-# This file was automatically generated by tmake at 19:50, 1999/10/13
+# This file was automatically generated by tmake at 15:16, 1999/10/21
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -363,7 +363,9 @@ GTK_HEADERS = \
                gtk/combobox.h \
                gtk/control.h \
                gtk/cursor.h \
                gtk/combobox.h \
                gtk/control.h \
                gtk/cursor.h \
+               gtk/dataform.h \
                gtk/dataobj.h \
                gtk/dataobj.h \
+               gtk/dataobj2.h \
                gtk/dc.h \
                gtk/dcclient.h \
                gtk/dcmemory.h \
                gtk/dc.h \
                gtk/dcclient.h \
                gtk/dcmemory.h \
@@ -423,7 +425,9 @@ MOTIF_HEADERS = \
                motif/combobox.h \
                motif/control.h \
                motif/cursor.h \
                motif/combobox.h \
                motif/control.h \
                motif/cursor.h \
+               motif/dataform.h \
                motif/dataobj.h \
                motif/dataobj.h \
+               motif/dataobj2.h \
                motif/dc.h \
                motif/dcclient.h \
                motif/dcmemory.h \
                motif/dc.h \
                motif/dcclient.h \
                motif/dcmemory.h \
@@ -568,6 +572,7 @@ GENERIC_HEADERS = \
                generic/filedlgg.h \
                generic/fontdlgg.h \
                generic/grid.h \
                generic/filedlgg.h \
                generic/fontdlgg.h \
                generic/grid.h \
+               generic/gridg.h \
                generic/helpext.h \
                generic/helphtml.h \
                generic/helpwxht.h \
                generic/helpext.h \
                generic/helphtml.h \
                generic/helpwxht.h \
@@ -606,6 +611,7 @@ HTML_HEADERS = \
                html/htmlpars.h \
                html/htmltag.h \
                html/htmlwin.h \
                html/htmlpars.h \
                html/htmltag.h \
                html/htmlwin.h \
+               html/htmprint.h \
                html/m_templ.h \
                html/winpars.h
 
                html/m_templ.h \
                html/winpars.h
 
@@ -618,6 +624,7 @@ GTK_GENERICOBJS = \
                dirdlgg.o \
                filedlgg.o \
                grid.o \
                dirdlgg.o \
                filedlgg.o \
                grid.o \
+               helpext.o \
                helphtml.o \
                helpwxht.o \
                imaglist.o \
                helphtml.o \
                helpwxht.o \
                imaglist.o \
@@ -637,7 +644,6 @@ GTK_GENERICOBJS = \
                scrolwin.o \
                splitter.o \
                statusbr.o \
                scrolwin.o \
                splitter.o \
                statusbr.o \
-               tabg.o \
                textdlgg.o \
                tipdlg.o \
                treectrl.o \
                textdlgg.o \
                tipdlg.o \
                treectrl.o \
@@ -652,6 +658,7 @@ GTK_GENERICDEPS = \
                dirdlgg.d \
                filedlgg.d \
                grid.d \
                dirdlgg.d \
                filedlgg.d \
                grid.d \
+               helpext.d \
                helphtml.d \
                helpwxht.d \
                imaglist.d \
                helphtml.d \
                helpwxht.d \
                imaglist.d \
@@ -671,7 +678,6 @@ GTK_GENERICDEPS = \
                scrolwin.d \
                splitter.d \
                statusbr.d \
                scrolwin.d \
                splitter.d \
                statusbr.d \
-               tabg.d \
                textdlgg.d \
                tipdlg.d \
                treectrl.d \
                textdlgg.d \
                tipdlg.d \
                treectrl.d \
@@ -679,14 +685,19 @@ GTK_GENERICDEPS = \
 
 GTK_COMMONOBJS = \
                parser.o \
 
 GTK_COMMONOBJS = \
                parser.o \
+               appcmn.o \
+               choiccmn.o \
+               clipcmn.o \
                cmndata.o \
                config.o \
                cmndata.o \
                config.o \
+               ctrlcmn.o \
                date.o \
                datstrm.o \
                db.o \
                dbtable.o \
                dcbase.o \
                dlgcmn.o \
                date.o \
                datstrm.o \
                db.o \
                dbtable.o \
                dcbase.o \
                dlgcmn.o \
+               dobjcmn.o \
                docmdi.o \
                docview.o \
                dynarray.o \
                docmdi.o \
                docview.o \
                dynarray.o \
@@ -766,14 +777,19 @@ GTK_COMMONOBJS = \
 
 GTK_COMMONDEPS = \
                parser.d \
 
 GTK_COMMONDEPS = \
                parser.d \
+               appcmn.d \
+               choiccmn.d \
+               clipcmn.d \
                cmndata.d \
                config.d \
                cmndata.d \
                config.d \
+               ctrlcmn.d \
                date.d \
                datstrm.d \
                db.d \
                dbtable.d \
                dcbase.d \
                dlgcmn.d \
                date.d \
                datstrm.d \
                db.d \
                dbtable.d \
                dcbase.d \
                dlgcmn.d \
+               dobjcmn.d \
                docmdi.d \
                docview.d \
                dynarray.d \
                docmdi.d \
                docview.d \
                dynarray.d \
@@ -980,6 +996,7 @@ MOTIF_GENERICOBJS = \
                dirdlgg.o \
                fontdlgg.o \
                grid.o \
                dirdlgg.o \
                fontdlgg.o \
                grid.o \
+               helpext.o \
                helphtml.o \
                helpwxht.o \
                helpxlp.o \
                helphtml.o \
                helpwxht.o \
                helpxlp.o \
@@ -1017,6 +1034,7 @@ MOTIF_GENERICDEPS = \
                dirdlgg.d \
                fontdlgg.d \
                grid.d \
                dirdlgg.d \
                fontdlgg.d \
                grid.d \
+               helpext.d \
                helphtml.d \
                helpwxht.d \
                helpxlp.d \
                helphtml.d \
                helpwxht.d \
                helpxlp.d \
@@ -1047,7 +1065,9 @@ MOTIF_GENERICDEPS = \
 
 MOTIF_COMMONOBJS = \
                parser.o \
 
 MOTIF_COMMONOBJS = \
                parser.o \
+               appcmn.o \
                choiccmn.o \
                choiccmn.o \
+               clipcmn.o \
                cmndata.o \
                config.o \
                ctrlcmn.o \
                cmndata.o \
                config.o \
                ctrlcmn.o \
@@ -1057,6 +1077,7 @@ MOTIF_COMMONOBJS = \
                dbtable.o \
                dcbase.o \
                dlgcmn.o \
                dbtable.o \
                dcbase.o \
                dlgcmn.o \
+               dobjcmn.o \
                docmdi.o \
                docview.o \
                dynarray.o \
                docmdi.o \
                docview.o \
                dynarray.o \
@@ -1137,7 +1158,9 @@ MOTIF_COMMONOBJS = \
 
 MOTIF_COMMONDEPS = \
                parser.d \
 
 MOTIF_COMMONDEPS = \
                parser.d \
+               appcmn.d \
                choiccmn.d \
                choiccmn.d \
+               clipcmn.d \
                cmndata.d \
                config.d \
                ctrlcmn.d \
                cmndata.d \
                config.d \
                ctrlcmn.d \
@@ -1147,6 +1170,7 @@ MOTIF_COMMONDEPS = \
                dbtable.d \
                dcbase.d \
                dlgcmn.d \
                dbtable.d \
                dcbase.d \
                dlgcmn.d \
+               dobjcmn.d \
                docmdi.d \
                docview.d \
                dynarray.d \
                docmdi.d \
                docview.d \
                dynarray.d \
@@ -1383,7 +1407,9 @@ MSW_GENERICDEPS = \
 
 MSW_COMMONOBJS = \
                parser.o \
 
 MSW_COMMONOBJS = \
                parser.o \
+               appcmn.o \
                choiccmn.o \
                choiccmn.o \
+               clipcmn.o \
                cmndata.o \
                config.o \
                ctrlcmn.o \
                cmndata.o \
                config.o \
                ctrlcmn.o \
@@ -1393,6 +1419,7 @@ MSW_COMMONOBJS = \
                dbtable.o \
                dcbase.o \
                dlgcmn.o \
                dbtable.o \
                dcbase.o \
                dlgcmn.o \
+               dobjcmn.o \
                docmdi.o \
                docview.o \
                dynarray.o \
                docmdi.o \
                docview.o \
                dynarray.o \
@@ -1473,7 +1500,9 @@ MSW_COMMONOBJS = \
 
 MSW_COMMONDEPS = \
                parser.d \
 
 MSW_COMMONDEPS = \
                parser.d \
+               appcmn.d \
                choiccmn.d \
                choiccmn.d \
+               clipcmn.d \
                cmndata.d \
                config.d \
                ctrlcmn.d \
                cmndata.d \
                config.d \
                ctrlcmn.d \
@@ -1483,6 +1512,7 @@ MSW_COMMONDEPS = \
                dbtable.d \
                dcbase.d \
                dlgcmn.d \
                dbtable.d \
                dcbase.d \
                dlgcmn.d \
+               dobjcmn.d \
                docmdi.d \
                docview.d \
                dynarray.d \
                docmdi.d \
                docview.d \
                dynarray.d \
@@ -1628,6 +1658,7 @@ MSW_GUIOBJS = \
                settings.o \
                slider95.o \
                spinbutt.o \
                settings.o \
                slider95.o \
                spinbutt.o \
+               spinctrl.o \
                statbmp.o \
                statbox.o \
                statbr95.o \
                statbmp.o \
                statbox.o \
                statbr95.o \
@@ -1714,6 +1745,7 @@ MSW_GUIDEPS = \
                settings.d \
                slider95.d \
                spinbutt.d \
                settings.d \
                slider95.d \
                spinbutt.d \
+               spinctrl.d \
                statbmp.d \
                statbox.d \
                statbr95.d \
                statbmp.d \
                statbox.d \
                statbr95.d \
@@ -1734,6 +1766,8 @@ MSW_GUIDEPS = \
                xpmhand.d
 
 BASE_OBJS = \
                xpmhand.d
 
 BASE_OBJS = \
+               init.o \
+               appcmn.o \
                config.o \
                date.o \
                dynarray.o \
                config.o \
                date.o \
                dynarray.o \
@@ -1746,7 +1780,6 @@ BASE_OBJS = \
                filefn.o \
                filesys.o \
                hash.o \
                filefn.o \
                filesys.o \
                hash.o \
-               init.o \
                intl.o \
                list.o \
                log.o \
                intl.o \
                list.o \
                log.o \
@@ -1768,6 +1801,8 @@ BASE_OBJS = \
                utilsunx.o
 
 BASE_DEPS = \
                utilsunx.o
 
 BASE_DEPS = \
+               init.d \
+               appcmn.d \
                config.d \
                date.d \
                dynarray.d \
                config.d \
                date.d \
                dynarray.d \
@@ -1780,7 +1815,6 @@ BASE_DEPS = \
                filefn.d \
                filesys.d \
                hash.d \
                filefn.d \
                filesys.d \
                hash.d \
-               init.d \
                intl.d \
                list.d \
                log.d \
                intl.d \
                list.d \
                log.d \
@@ -1810,6 +1844,7 @@ HTMLOBJS = \
                htmlpars.o \
                htmltag.o \
                htmlwin.o \
                htmlpars.o \
                htmltag.o \
                htmlwin.o \
+               htmprint.o \
                m_fonts.o \
                m_hline.o \
                m_image.o \
                m_fonts.o \
                m_hline.o \
                m_image.o \
@@ -1830,6 +1865,7 @@ HTMLDEPS = \
                htmlpars.d \
                htmltag.d \
                htmlwin.d \
                htmlpars.d \
                htmltag.d \
                htmlwin.d \
+               htmprint.d \
                m_fonts.d \
                m_hline.d \
                m_image.d \
                m_fonts.d \
                m_hline.d \
                m_image.d \
@@ -1979,7 +2015,7 @@ all: @WX_ALL@
 @WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
        @$(INSTALL) -d ./lib
        $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
 @WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
        @$(INSTALL) -d ./lib
        $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
-
+       
 CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
        @$(RM) ./lib/@WX_LIBRARY_LINK1@
        @$(RM) ./lib/@WX_LIBRARY_LINK2@
 CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
        @$(RM) ./lib/@WX_LIBRARY_LINK1@
        @$(RM) ./lib/@WX_LIBRARY_LINK2@
@@ -1987,7 +2023,7 @@ CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
        $(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@
        $(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@
-
+       
 CREATE_INSTALLED_LINKS:  $(libdir)/@WX_LIBRARY_NAME_SHARED@
        $(RM) $(libdir)/@WX_LIBRARY_LINK1@
        $(RM) $(libdir)/@WX_LIBRARY_LINK2@
 CREATE_INSTALLED_LINKS:  $(libdir)/@WX_LIBRARY_NAME_SHARED@
        $(RM) $(libdir)/@WX_LIBRARY_LINK1@
        $(RM) $(libdir)/@WX_LIBRARY_LINK2@
@@ -1995,7 +2031,7 @@ CREATE_INSTALLED_LINKS:  $(libdir)/@WX_LIBRARY_NAME_SHARED@
        $(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@
        $(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@
-
+       
 $(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
 
 parser.o:    parser.c lexer.c
 $(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
 
 parser.o:    parser.c lexer.c
@@ -2039,13 +2075,13 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
        $(INSTALL) -d $(libdir)/wx/include/wx
        $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
        $(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
        $(INSTALL) -d $(libdir)/wx/include/wx
        $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
        $(INSTALL_DATA) $(top_builddir)/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 $(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
        $(INSTALL) -d $(includedir)/wx/msw
        $(INSTALL) -d $(includedir)/wx/gtk
@@ -2058,7 +2094,7 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
          $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
          echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
        done
          $(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"
 write_message:
        @echo " "
        @echo " The installation of wxWindows is finished.  On certain"
@@ -2300,10 +2336,7 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/html/help/helpfiles/*.??? $(DISTDIR)/samples/html/help/helpfiles
        mkdir $(DISTDIR)/samples/html/printing
        cp $(SAMPDIR)/html/printing/Makefile.in $(DISTDIR)/samples/html/printing
        cp $(SAMPDIR)/html/help/helpfiles/*.??? $(DISTDIR)/samples/html/help/helpfiles
        mkdir $(DISTDIR)/samples/html/printing
        cp $(SAMPDIR)/html/printing/Makefile.in $(DISTDIR)/samples/html/printing
-       cp $(SAMPDIR)/html/printing/*.xpm $(DISTDIR)/samples/html/printing
        cp $(SAMPDIR)/html/printing/*.cpp $(DISTDIR)/samples/html/printing
        cp $(SAMPDIR)/html/printing/*.cpp $(DISTDIR)/samples/html/printing
-       cp $(SAMPDIR)/html/printing/*.h $(DISTDIR)/samples/html/printing
-       cp $(SAMPDIR)/html/printing/*.png $(DISTDIR)/samples/html/printing
        cp $(SAMPDIR)/html/printing/*.htm $(DISTDIR)/samples/html/printing
        mkdir $(DISTDIR)/samples/html/test
        cp $(SAMPDIR)/html/test/Makefile.in $(DISTDIR)/samples/html/test
        cp $(SAMPDIR)/html/printing/*.htm $(DISTDIR)/samples/html/printing
        mkdir $(DISTDIR)/samples/html/test
        cp $(SAMPDIR)/html/test/Makefile.in $(DISTDIR)/samples/html/test
@@ -2350,24 +2383,29 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/listctrl/*.cpp $(DISTDIR)/samples/listctrl
        cp $(SAMPDIR)/listctrl/*.h $(DISTDIR)/samples/listctrl
        cp $(SAMPDIR)/listctrl/*.xpm $(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/bitmap
-       cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl/bitmaps
+       mkdir $(DISTDIR)/samples/listctrl/bitmaps
+       cp $(SAMPDIR)/listctrl/bitmaps/*.xpm $(DISTDIR)/samples/listctrl/bitmaps
        mkdir $(DISTDIR)/samples/mdi
        cp $(SAMPDIR)/mdi/Makefile.in $(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
        cp $(SAMPDIR)/mdi/Makefile.in $(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/minifram
        cp $(SAMPDIR)/minifram/Makefile.in $(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
        cp $(SAMPDIR)/minifram/Makefile.in $(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/bitmap
-       cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram/bitmaps
+       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/*.cpp $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
        mkdir $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
+       mkdir $(DISTDIR)/samples/nettest
+       cp $(SAMPDIR)/nettest/Makefile.in $(DISTDIR)/samples/nettest
+       cp $(SAMPDIR)/nettest/*.cpp $(DISTDIR)/samples/nettest
        mkdir $(DISTDIR)/samples/newgrid
        cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid
        cp $(SAMPDIR)/newgrid/*.cpp $(DISTDIR)/samples/newgrid
        mkdir $(DISTDIR)/samples/newgrid
        cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid
        cp $(SAMPDIR)/newgrid/*.cpp $(DISTDIR)/samples/newgrid
@@ -2404,6 +2442,9 @@ SAMPLES_DIST:
        mkdir $(DISTDIR)/samples/scroll
        cp $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll
        cp $(SAMPDIR)/scroll/*.cpp $(DISTDIR)/samples/scroll
        mkdir $(DISTDIR)/samples/scroll
        cp $(SAMPDIR)/scroll/Makefile.in $(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/*.cpp $(DISTDIR)/samples/scrollsub
        mkdir $(DISTDIR)/samples/splitter
        cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
        cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter
        mkdir $(DISTDIR)/samples/splitter
        cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
        cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter
@@ -2419,8 +2460,8 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/toolbar/*.cpp $(DISTDIR)/samples/toolbar
        cp $(SAMPDIR)/toolbar/*.h $(DISTDIR)/samples/toolbar
        cp $(SAMPDIR)/toolbar/*.xpm $(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/bitmap
-       cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar/bitmaps
+       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
        mkdir $(DISTDIR)/samples/treectrl
        cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl
        cp $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl
@@ -2454,7 +2495,7 @@ SAMPLES_DIST:
 UTILS_DIST:
        mkdir $(DISTDIR)/utils
        cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
 UTILS_DIST:
        mkdir $(DISTDIR)/utils
        cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
-
+       
        mkdir $(DISTDIR)/utils/wxMMedia2
        mkdir $(DISTDIR)/utils/wxMMedia2/lib
        mkdir $(DISTDIR)/utils/wxMMedia2/sample
        mkdir $(DISTDIR)/utils/wxMMedia2
        mkdir $(DISTDIR)/utils/wxMMedia2/lib
        mkdir $(DISTDIR)/utils/wxMMedia2/sample
@@ -2465,7 +2506,7 @@ UTILS_DIST:
        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
        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
        mkdir $(DISTDIR)/utils/glcanvas
        mkdir $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
        cp $(UTILSDIR)/glcanvas/Makefile.in $(DISTDIR)/utils/glcanvas
@@ -2473,21 +2514,21 @@ UTILS_DIST:
        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)
        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
        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
-
+       
 MISC_DIST:
        mkdir $(DISTDIR)/misc
        mkdir $(DISTDIR)/misc/afm
        cp $(MISCDIR)/afm/*.afm  $(DISTDIR)/misc/afm
        mkdir $(DISTDIR)/misc/gs_afm
        cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm
 MISC_DIST:
        mkdir $(DISTDIR)/misc
        mkdir $(DISTDIR)/misc/afm
        cp $(MISCDIR)/afm/*.afm  $(DISTDIR)/misc/afm
        mkdir $(DISTDIR)/misc/gs_afm
        cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm
-
+       
 dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST
        cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
        $(RM) -r _dist_dir
 dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST
        cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
        $(RM) -r _dist_dir
wxWidgets (Impactor)