From: Robert Roebling Date: Tue, 12 Oct 1999 14:36:37 +0000 (+0000) Subject: Some more distrib corrections. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c09ab26a49195b06caaf4eb1ceb159f7eeb08e2f Some more distrib corrections. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.in b/Makefile.in index f667aa8a0a..8bd800e818 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,5 @@ # -# This file was automatically generated by tmake at 10:20, 1999/10/12 +# This file was automatically generated by tmake at 15:24, 1999/10/12 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T! # @@ -112,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 @@ -295,6 +296,7 @@ WX_HEADERS = \ slider.h \ socket.h \ spinbutt.h \ + spinctrl.h \ splitter.h \ statbmp.h \ statbox.h \ @@ -391,6 +393,7 @@ GTK_HEADERS = \ gtk/settings.h \ gtk/slider.h \ gtk/spinbutt.h \ + gtk/spinctrl.h \ gtk/statbmp.h \ gtk/statbox.h \ gtk/statline.h \ @@ -604,7 +607,6 @@ HTML_HEADERS = \ html/htmltag.h \ html/htmlwin.h \ html/m_templ.h \ - html/version.h \ html/winpars.h GTK_GENERICOBJS = \ @@ -2057,8 +2059,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." @@ -2146,6 +2148,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 @@ -2167,6 +2170,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) @@ -2316,6 +2326,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 @@ -2417,24 +2439,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 diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index 04812c4679..a8c30b4be1 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -544,6 +544,7 @@ sizer.h W slider.h W socket.h W spinbutt.h W +spinctrl.h W splitter.h W statbmp.h W statbox.h W @@ -639,6 +640,7 @@ scrolbar.h K settings.h K slider.h K spinbutt.h K +spinctrl.h K statbmp.h K statbox.h K statline.h K @@ -843,7 +845,6 @@ htmltag.h L htmlwin.h L winpars.h L m_templ.h L -version.h L caret.h N choicdgg.h N diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t index 4dbd27a39b..29e03dac1a 100644 --- a/distrib/msw/tmake/unx.t +++ b/distrib/msw/tmake/unx.t @@ -285,6 +285,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 @@ -614,8 +615,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." @@ -703,6 +704,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 @@ -724,6 +726,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) @@ -873,6 +882,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 @@ -974,24 +995,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