]> 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 7c2cabbc9f466a152e5c93e8cac890fa4fe8a63d..c5ee81b384811dc49f11b738ff37d917096fdfb5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 11:14, 1999/10/09
+# 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!
 
 #
@@ -44,8 +44,9 @@ 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
 
-VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9)
+VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10)
 
 top_srcdir = @top_srcdir@
 prefix = @prefix@
@@ -111,6 +112,7 @@ ZLIBDIR  = $(WXDIR)/src/zlib
 GTKDIR   = $(WXDIR)/src/gtk
 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
+ODBCDIR  = $(WXDIR)/src/iodbc
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
 UTILSDIR = $(WXDIR)/utils
@@ -120,7 +122,7 @@ DOCDIR = $(WXDIR)/docs
 
 ########################## Archive name ###############################
 
-WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)-b9.tgz
+WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
 DISTDIR = ./_dist_dir/wx$(TOOLKIT)
 
 ############################## Files ##################################
@@ -294,6 +296,7 @@ WX_HEADERS = \
                slider.h \
                socket.h \
                spinbutt.h \
+               spinctrl.h \
                splitter.h \
                statbmp.h \
                statbox.h \
@@ -360,7 +363,9 @@ GTK_HEADERS = \
                gtk/combobox.h \
                gtk/control.h \
                gtk/cursor.h \
+               gtk/dataform.h \
                gtk/dataobj.h \
+               gtk/dataobj2.h \
                gtk/dc.h \
                gtk/dcclient.h \
                gtk/dcmemory.h \
@@ -390,6 +395,7 @@ GTK_HEADERS = \
                gtk/settings.h \
                gtk/slider.h \
                gtk/spinbutt.h \
+               gtk/spinctrl.h \
                gtk/statbmp.h \
                gtk/statbox.h \
                gtk/statline.h \
@@ -419,7 +425,9 @@ MOTIF_HEADERS = \
                motif/combobox.h \
                motif/control.h \
                motif/cursor.h \
+               motif/dataform.h \
                motif/dataobj.h \
+               motif/dataobj2.h \
                motif/dc.h \
                motif/dcclient.h \
                motif/dcmemory.h \
@@ -564,6 +572,7 @@ GENERIC_HEADERS = \
                generic/filedlgg.h \
                generic/fontdlgg.h \
                generic/grid.h \
+               generic/gridg.h \
                generic/helpext.h \
                generic/helphtml.h \
                generic/helpwxht.h \
@@ -602,8 +611,8 @@ HTML_HEADERS = \
                html/htmlpars.h \
                html/htmltag.h \
                html/htmlwin.h \
+               html/htmprint.h \
                html/m_templ.h \
-               html/version.h \
                html/winpars.h
 
 GTK_GENERICOBJS = \
@@ -615,6 +624,7 @@ GTK_GENERICOBJS = \
                dirdlgg.o \
                filedlgg.o \
                grid.o \
+               helpext.o \
                helphtml.o \
                helpwxht.o \
                imaglist.o \
@@ -648,6 +658,7 @@ GTK_GENERICDEPS = \
                dirdlgg.d \
                filedlgg.d \
                grid.d \
+               helpext.d \
                helphtml.d \
                helpwxht.d \
                imaglist.d \
@@ -674,14 +685,19 @@ GTK_GENERICDEPS = \
 
 GTK_COMMONOBJS = \
                parser.o \
+               appcmn.o \
+               choiccmn.o \
+               clipcmn.o \
                cmndata.o \
                config.o \
+               ctrlcmn.o \
                date.o \
                datstrm.o \
                db.o \
                dbtable.o \
                dcbase.o \
                dlgcmn.o \
+               dobjcmn.o \
                docmdi.o \
                docview.o \
                dynarray.o \
@@ -761,14 +777,19 @@ GTK_COMMONOBJS = \
 
 GTK_COMMONDEPS = \
                parser.d \
+               appcmn.d \
+               choiccmn.d \
+               clipcmn.d \
                cmndata.d \
                config.d \
+               ctrlcmn.d \
                date.d \
                datstrm.d \
                db.d \
                dbtable.d \
                dcbase.d \
                dlgcmn.d \
+               dobjcmn.d \
                docmdi.d \
                docview.d \
                dynarray.d \
@@ -891,6 +912,7 @@ GTK_GUIOBJS = \
                settings.o \
                slider.o \
                spinbutt.o \
+               spinctrl.o \
                statbmp.o \
                statbox.o \
                statline.o \
@@ -950,6 +972,7 @@ GTK_GUIDEPS = \
                settings.d \
                slider.d \
                spinbutt.d \
+               spinctrl.d \
                statbmp.d \
                statbox.d \
                statline.d \
@@ -973,6 +996,7 @@ MOTIF_GENERICOBJS = \
                dirdlgg.o \
                fontdlgg.o \
                grid.o \
+               helpext.o \
                helphtml.o \
                helpwxht.o \
                helpxlp.o \
@@ -1010,6 +1034,7 @@ MOTIF_GENERICDEPS = \
                dirdlgg.d \
                fontdlgg.d \
                grid.d \
+               helpext.d \
                helphtml.d \
                helpwxht.d \
                helpxlp.d \
@@ -1040,7 +1065,9 @@ MOTIF_GENERICDEPS = \
 
 MOTIF_COMMONOBJS = \
                parser.o \
+               appcmn.o \
                choiccmn.o \
+               clipcmn.o \
                cmndata.o \
                config.o \
                ctrlcmn.o \
@@ -1050,6 +1077,7 @@ MOTIF_COMMONOBJS = \
                dbtable.o \
                dcbase.o \
                dlgcmn.o \
+               dobjcmn.o \
                docmdi.o \
                docview.o \
                dynarray.o \
@@ -1130,7 +1158,9 @@ MOTIF_COMMONOBJS = \
 
 MOTIF_COMMONDEPS = \
                parser.d \
+               appcmn.d \
                choiccmn.d \
+               clipcmn.d \
                cmndata.d \
                config.d \
                ctrlcmn.d \
@@ -1140,6 +1170,7 @@ MOTIF_COMMONDEPS = \
                dbtable.d \
                dcbase.d \
                dlgcmn.d \
+               dobjcmn.d \
                docmdi.d \
                docview.d \
                dynarray.d \
@@ -1376,7 +1407,9 @@ MSW_GENERICDEPS = \
 
 MSW_COMMONOBJS = \
                parser.o \
+               appcmn.o \
                choiccmn.o \
+               clipcmn.o \
                cmndata.o \
                config.o \
                ctrlcmn.o \
@@ -1386,6 +1419,7 @@ MSW_COMMONOBJS = \
                dbtable.o \
                dcbase.o \
                dlgcmn.o \
+               dobjcmn.o \
                docmdi.o \
                docview.o \
                dynarray.o \
@@ -1466,7 +1500,9 @@ MSW_COMMONOBJS = \
 
 MSW_COMMONDEPS = \
                parser.d \
+               appcmn.d \
                choiccmn.d \
+               clipcmn.d \
                cmndata.d \
                config.d \
                ctrlcmn.d \
@@ -1476,6 +1512,7 @@ MSW_COMMONDEPS = \
                dbtable.d \
                dcbase.d \
                dlgcmn.d \
+               dobjcmn.d \
                docmdi.d \
                docview.d \
                dynarray.d \
@@ -1621,6 +1658,7 @@ MSW_GUIOBJS = \
                settings.o \
                slider95.o \
                spinbutt.o \
+               spinctrl.o \
                statbmp.o \
                statbox.o \
                statbr95.o \
@@ -1707,6 +1745,7 @@ MSW_GUIDEPS = \
                settings.d \
                slider95.d \
                spinbutt.d \
+               spinctrl.d \
                statbmp.d \
                statbox.d \
                statbr95.d \
@@ -1727,6 +1766,8 @@ MSW_GUIDEPS = \
                xpmhand.d
 
 BASE_OBJS = \
+               init.o \
+               appcmn.o \
                config.o \
                date.o \
                dynarray.o \
@@ -1739,7 +1780,6 @@ BASE_OBJS = \
                filefn.o \
                filesys.o \
                hash.o \
-               init.o \
                intl.o \
                list.o \
                log.o \
@@ -1761,6 +1801,8 @@ BASE_OBJS = \
                utilsunx.o
 
 BASE_DEPS = \
+               init.d \
+               appcmn.d \
                config.d \
                date.d \
                dynarray.d \
@@ -1773,7 +1815,6 @@ BASE_DEPS = \
                filefn.d \
                filesys.d \
                hash.d \
-               init.d \
                intl.d \
                list.d \
                log.d \
@@ -1803,6 +1844,7 @@ HTMLOBJS = \
                htmlpars.o \
                htmltag.o \
                htmlwin.o \
+               htmprint.o \
                m_fonts.o \
                m_hline.o \
                m_image.o \
@@ -1823,6 +1865,7 @@ HTMLDEPS = \
                htmlpars.d \
                htmltag.d \
                htmlwin.d \
+               htmprint.d \
                m_fonts.d \
                m_hline.d \
                m_image.d \
@@ -1928,6 +1971,23 @@ JPEGOBJS    = \
                jquant2.o \
                jdmerge.o
 
+IODBC_OBJS = \
+               catalog.o \
+               connect.o \
+               dlf.o \
+               dlproc.o \
+               execute.o \
+               fetch.o \
+               hdbc.o \
+               henv.o \
+               herr.o \
+               hstmt.o \
+               info.o \
+               itrace.o \
+               misc.o \
+               prepare.o \
+               result.o
+
 GUIOBJS = @GUIOBJS@
 GUIDEPS = @GUIDEPS@
 GUIHEADERS = @GUIHEADERS@
@@ -1937,6 +1997,7 @@ GENERICOBJS = @GENERICOBJS@
 GENERICDEPS = @GENERICDEPS@
 UNIXOBJS = @UNIXOBJS@
 UNIXDEPS = @UNIXDEPS@
+IODBCOBJS = @IODBCOBJS@
 
 OBJECTS = @ALL_OBJECTS@
 
@@ -2037,8 +2098,8 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
 write_message:
        @echo " "
        @echo " The installation of wxWindows is finished.  On certain"
-       @echo " platforms (e.g. Linux, Solaris) you'll now have to run"
-       @echo " ldconfig if you installed a shared library."
+       @echo " platforms (e.g. Linux) you'll now have to run ldconfig"
+       @echo " if you installed a shared library."
        @echo " "
        @echo " wxWindows comes with  no guarantees  and doesn't claim"
        @echo " to be suitable for any purpose."
@@ -2126,6 +2187,7 @@ ALL_DIST:
        mkdir $(DISTDIR)/src/png
        mkdir $(DISTDIR)/src/jpeg
        mkdir $(DISTDIR)/src/zlib
+       mkdir $(DISTDIR)/src/iodbc
        cp $(SRCDIR)/*.in $(DISTDIR)/src
        cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
        cp $(COMMDIR)/*.c $(DISTDIR)/src/common
@@ -2135,9 +2197,7 @@ ALL_DIST:
        cp $(COMMDIR)/*.y $(DISTDIR)/src/common
        cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic
        cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
-       cp $(HTMLDIR)/*.h $(DISTDIR)/src/html
        cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps
-       cp $(UNIXDIR)/*.h $(DISTDIR)/src/unix
        cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix
        cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
        cp $(PNGDIR)/*.h $(DISTDIR)/src/png
@@ -2149,6 +2209,13 @@ ALL_DIST:
        cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
        cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
        cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
+       cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
+       cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc
+       cp $(ODBCDIR)/*.ci $(DISTDIR)/src/iodbc
+       cp $(ODBCDIR)/*.exp $(DISTDIR)/src/iodbc
+       cp $(ODBCDIR)/README $(DISTDIR)/src/iodbc
+       cp $(ODBCDIR)/NEWS $(DISTDIR)/src/iodbc
+       cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc
 
 GTK_DIST:
        cp $(WXDIR)/wxGTK.spec $(DISTDIR)
@@ -2213,6 +2280,11 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
        cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
        cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
+       mkdir $(DISTDIR)/samples/db
+       cp $(SAMPDIR)/db/Makefile.in $(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/*.cpp $(DISTDIR)/samples/dialogs
@@ -2241,6 +2313,14 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/dynamic/Makefile.in $(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/*.cpp $(DISTDIR)/samples/forty
+       cp $(SAMPDIR)/forty/*.xpm $(DISTDIR)/samples/forty
+       cp $(SAMPDIR)/forty/*.xbm $(DISTDIR)/samples/forty
+       mkdir $(DISTDIR)/samples/fractal
+       cp $(SAMPDIR)/fractal/Makefile.in $(DISTDIR)/samples/fractal
+       cp $(SAMPDIR)/fractal/*.cpp $(DISTDIR)/samples/fractal
        mkdir $(DISTDIR)/samples/html
        cp $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html
        mkdir $(DISTDIR)/samples/html/about
@@ -2256,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/printing/*.xpm $(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
@@ -2285,6 +2362,18 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/image/Makefile.in $(DISTDIR)/samples/image
        cp $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image
        cp $(SAMPDIR)/image/horse.* $(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/*.cpp $(DISTDIR)/samples/internat
+       cp $(SAMPDIR)/internat/*.xpm $(DISTDIR)/samples/internat
+       cp $(SAMPDIR)/internat/*.txt $(DISTDIR)/samples/internat
+       cp $(SAMPDIR)/internat/*.po $(DISTDIR)/samples/internat
+       cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
+       cp $(SAMPDIR)/internat/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/*.cpp $(DISTDIR)/samples/layout
@@ -2294,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
-       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/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/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/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
@@ -2320,6 +2414,23 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/notebook/Makefile.in $(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/*.cpp $(DISTDIR)/samples/png
+       cp $(SAMPDIR)/png/*.h $(DISTDIR)/samples/png
+       cp $(SAMPDIR)/png/*.png $(DISTDIR)/samples/png
+       mkdir $(DISTDIR)/samples/resource
+       cp $(SAMPDIR)/resource/Makefile.in $(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
+       cp $(SAMPDIR)/richedit/*.h $(DISTDIR)/samples/richedit
+       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
@@ -2331,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/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
@@ -2346,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
-       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
@@ -2381,24 +2495,33 @@ SAMPLES_DIST:
 UTILS_DIST:
        mkdir $(DISTDIR)/utils
        cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
+       
        mkdir $(DISTDIR)/utils/wxMMedia2
-       cp $(UTILSDIR)/wxMMedia2/Makefile.in $(DISTDIR)/utils/wxMMedia2
        mkdir $(DISTDIR)/utils/wxMMedia2/lib
+       mkdir $(DISTDIR)/utils/wxMMedia2/sample
+       cp $(UTILSDIR)/wxMMedia2/Makefile.in $(DISTDIR)/utils/wxMMedia2
        cp $(UTILSDIR)/wxMMedia2/lib/Makefile.in $(DISTDIR)/utils/wxMMedia2/lib
        cp $(UTILSDIR)/wxMMedia2/lib/*.h $(DISTDIR)/utils/wxMMedia2/lib
        cp $(UTILSDIR)/wxMMedia2/lib/*.cpp $(DISTDIR)/utils/wxMMedia2/lib
        cp $(UTILSDIR)/wxMMedia2/lib/*.def $(DISTDIR)/utils/wxMMedia2/lib
-       mkdir $(DISTDIR)/utils/wxMMedia2/sample
        cp $(UTILSDIR)/wxMMedia2/sample/Makefile.in $(DISTDIR)/utils/wxMMedia2/sample
        cp $(UTILSDIR)/wxMMedia2/sample/*.cpp $(DISTDIR)/utils/wxMMedia2/sample
+       
        mkdir $(DISTDIR)/utils/glcanvas
+       mkdir $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
        cp $(UTILSDIR)/glcanvas/Makefile.in $(DISTDIR)/utils/glcanvas
        cp $(UTILSDIR)/glcanvas/docs/notes.txt $(DISTDIR)/utils/glcanvas/NOTES.txt
-       mkdir $(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
+       
 MISC_DIST:
        mkdir $(DISTDIR)/misc
        mkdir $(DISTDIR)/misc/afm
wxWidgets (Impactor)