From: Robert Roebling <robert@roebling.de>
Date: Wed, 25 Aug 1999 16:39:29 +0000 (+0000)
Subject: Many distribution things.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/641d87d868e0f46f4bfca3d8d7bede88032045e1
Many distribution things.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
diff --git a/Makefile.in b/Makefile.in
index 0a6fff17dc..504eefe05f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
#
-# This file was automatically generated by tmake at 19:37, 1999/08/24
+# This file was automatically generated by tmake at 17:12, 1999/08/25
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
#
@@ -113,6 +113,7 @@ MOTIFDIR = $(WXDIR)/src/motif
MSWDIR = $(WXDIR)/src/msw
INCDIR = $(WXDIR)/include
SAMPDIR = $(WXDIR)/samples
+UTILSDIR = $(WXDIR)/utils
DOCDIR = $(WXDIR)/docs
@@ -2031,14 +2032,195 @@ SAMPLES_DIST:
cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst
cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst
cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
- mkdir $(DISTDIR)/samples/checkls
+ mkdir $(DISTDIR)/samples/printing
cp $(SAMPDIR)/printing/Makefile.in $(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
-
-dist: ALL_DIST @GUIDIST@ SAMPLES_DIST
+ mkdir $(DISTDIR)/samples/dialogs
+ cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs
+ cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
+ cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs
+ cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
+ mkdir $(DISTDIR)/samples/dnd
+ cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd
+ cp $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd
+ cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd
+ cp $(SAMPDIR)/dnd/*.txt $(DISTDIR)/samples/dnd
+ cp $(SAMPDIR)/dnd/*.png $(DISTDIR)/samples/dnd
+ mkdir $(DISTDIR)/samples/docview
+ cp $(SAMPDIR)/docview/Makefile.in $(DISTDIR)/samples/docview
+ cp $(SAMPDIR)/docview/*.cpp $(DISTDIR)/samples/docview
+ cp $(SAMPDIR)/docview/*.h $(DISTDIR)/samples/docview
+ cp $(SAMPDIR)/docview/*.xpm $(DISTDIR)/samples/docview
+ mkdir $(DISTDIR)/samples/docvwmdi
+ cp $(SAMPDIR)/docvwmdi/Makefile.in $(DISTDIR)/samples/docvwmdi
+ cp $(SAMPDIR)/docvwmdi/*.cpp $(DISTDIR)/samples/docvwmdi
+ cp $(SAMPDIR)/docvwmdi/*.h $(DISTDIR)/samples/docvwmdi
+ mkdir $(DISTDIR)/samples/drawing
+ cp $(SAMPDIR)/drawing/Makefile.in $(DISTDIR)/samples/drawing
+ cp $(SAMPDIR)/drawing/*.cpp $(DISTDIR)/samples/drawing
+ cp $(SAMPDIR)/drawing/*.xpm $(DISTDIR)/samples/drawing
+ mkdir $(DISTDIR)/samples/dynamic
+ 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/html
+ cp $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html
+ mkdir $(DISTDIR)/samples/html/about
+ cp $(SAMPDIR)/html/about/Makefile.in $(DISTDIR)/samples/html/about
+ cp $(SAMPDIR)/html/about/*.cpp $(DISTDIR)/samples/html/about
+ mkdir $(DISTDIR)/samples/html/about/data
+ cp $(SAMPDIR)/html/about/data/*.htm $(DISTDIR)/samples/html/about/data
+ cp $(SAMPDIR)/html/about/data/*.png $(DISTDIR)/samples/html/about/data
+ mkdir $(DISTDIR)/samples/html/help
+ cp $(SAMPDIR)/html/help/Makefile.in $(DISTDIR)/samples/html/help
+ cp $(SAMPDIR)/html/help/*.cpp $(DISTDIR)/samples/html/help
+ mkdir $(DISTDIR)/samples/html/help/helpfiles
+ 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
+ cp $(SAMPDIR)/html/test/*.cpp $(DISTDIR)/samples/html/test
+ cp $(SAMPDIR)/html/test/*.bmp $(DISTDIR)/samples/html/test
+ cp $(SAMPDIR)/html/test/*.png $(DISTDIR)/samples/html/test
+ cp $(SAMPDIR)/html/test/*.htm $(DISTDIR)/samples/html/test
+ cp $(SAMPDIR)/html/test/*.html $(DISTDIR)/samples/html/test
+ mkdir $(DISTDIR)/samples/html/virtual
+ cp $(SAMPDIR)/html/virtual/Makefile.in $(DISTDIR)/samples/html/virtual
+ cp $(SAMPDIR)/html/virtual/*.cpp $(DISTDIR)/samples/html/virtual
+ cp $(SAMPDIR)/html/virtual/*.htm $(DISTDIR)/samples/html/virtual
+ mkdir $(DISTDIR)/samples/html/widget
+ cp $(SAMPDIR)/html/widget/Makefile.in $(DISTDIR)/samples/html/widget
+ cp $(SAMPDIR)/html/widget/*.cpp $(DISTDIR)/samples/html/widget
+ cp $(SAMPDIR)/html/widget/*.htm $(DISTDIR)/samples/html/widget
+ mkdir $(DISTDIR)/samples/html/zip
+ cp $(SAMPDIR)/html/zip/Makefile.in $(DISTDIR)/samples/html/zip
+ cp $(SAMPDIR)/html/zip/*.cpp $(DISTDIR)/samples/html/zip
+ cp $(SAMPDIR)/html/zip/*.htm $(DISTDIR)/samples/html/zip
+ cp $(SAMPDIR)/html/zip/*.zip $(DISTDIR)/samples/html/zip
+ mkdir $(DISTDIR)/samples/image
+ 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/layout
+ cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout
+ cp $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout
+ cp $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout
+ mkdir $(DISTDIR)/samples/listctrl
+ cp $(SAMPDIR)/listctrl/Makefile.in $(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/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/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/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/notebook
+ 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/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/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/*.cpp $(DISTDIR)/samples/scroll
+ mkdir $(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/*.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/*.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/*.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/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
+ cp $(SAMPDIR)/wxsocket/*.xpm $(DISTDIR)/samples/wxsocket
+
+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
+ 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
+ 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)
+
+dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST
cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
$(RM) -r _dist_dir
diff --git a/configure b/configure
index 5f70050bf6..d9ab6ce490 100755
--- a/configure
+++ b/configure
@@ -11956,6 +11956,8 @@ trap 'rm -fr `echo "
utils/wxMMedia2/Makefile
utils/wxMMedia2/lib/Makefile
utils/wxMMedia2/sample/Makefile
+ utils/glcanvas/Makefile
+ utils/glcanvas/${TOOLKIT_DIR}/Makefile
setup.h:setup.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@@ -12155,6 +12157,8 @@ CONFIG_FILES=\${CONFIG_FILES-"wx-config
utils/wxMMedia2/Makefile
utils/wxMMedia2/lib/Makefile
utils/wxMMedia2/sample/Makefile
+ utils/glcanvas/Makefile
+ utils/glcanvas/${TOOLKIT_DIR}/Makefile
"}
EOF
cat >> $CONFIG_STATUS <<\EOF
diff --git a/configure.in b/configure.in
index 22cae4127e..1c6fe05030 100644
--- a/configure.in
+++ b/configure.in
@@ -2806,6 +2806,8 @@ AC_OUTPUT([
utils/wxMMedia2/Makefile
utils/wxMMedia2/lib/Makefile
utils/wxMMedia2/sample/Makefile
+ utils/glcanvas/Makefile
+ utils/glcanvas/${TOOLKIT_DIR}/Makefile
],
[
chmod +x wx-config
diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t
index 5ad83d91a1..dcb078b743 100644
--- a/distrib/msw/tmake/unx.t
+++ b/distrib/msw/tmake/unx.t
@@ -283,6 +283,7 @@ MOTIFDIR = $(WXDIR)/src/motif
MSWDIR = $(WXDIR)/src/msw
INCDIR = $(WXDIR)/include
SAMPDIR = $(WXDIR)/samples
+UTILSDIR = $(WXDIR)/utils
DOCDIR = $(WXDIR)/docs
@@ -733,14 +734,195 @@ SAMPLES_DIST:
cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst
cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst
cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
- mkdir $(DISTDIR)/samples/checkls
+ mkdir $(DISTDIR)/samples/printing
cp $(SAMPDIR)/printing/Makefile.in $(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
-
-dist: ALL_DIST @GUIDIST@ SAMPLES_DIST
+ mkdir $(DISTDIR)/samples/dialogs
+ cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs
+ cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
+ cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs
+ cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
+ mkdir $(DISTDIR)/samples/dnd
+ cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd
+ cp $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd
+ cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd
+ cp $(SAMPDIR)/dnd/*.txt $(DISTDIR)/samples/dnd
+ cp $(SAMPDIR)/dnd/*.png $(DISTDIR)/samples/dnd
+ mkdir $(DISTDIR)/samples/docview
+ cp $(SAMPDIR)/docview/Makefile.in $(DISTDIR)/samples/docview
+ cp $(SAMPDIR)/docview/*.cpp $(DISTDIR)/samples/docview
+ cp $(SAMPDIR)/docview/*.h $(DISTDIR)/samples/docview
+ cp $(SAMPDIR)/docview/*.xpm $(DISTDIR)/samples/docview
+ mkdir $(DISTDIR)/samples/docvwmdi
+ cp $(SAMPDIR)/docvwmdi/Makefile.in $(DISTDIR)/samples/docvwmdi
+ cp $(SAMPDIR)/docvwmdi/*.cpp $(DISTDIR)/samples/docvwmdi
+ cp $(SAMPDIR)/docvwmdi/*.h $(DISTDIR)/samples/docvwmdi
+ mkdir $(DISTDIR)/samples/drawing
+ cp $(SAMPDIR)/drawing/Makefile.in $(DISTDIR)/samples/drawing
+ cp $(SAMPDIR)/drawing/*.cpp $(DISTDIR)/samples/drawing
+ cp $(SAMPDIR)/drawing/*.xpm $(DISTDIR)/samples/drawing
+ mkdir $(DISTDIR)/samples/dynamic
+ 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/html
+ cp $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html
+ mkdir $(DISTDIR)/samples/html/about
+ cp $(SAMPDIR)/html/about/Makefile.in $(DISTDIR)/samples/html/about
+ cp $(SAMPDIR)/html/about/*.cpp $(DISTDIR)/samples/html/about
+ mkdir $(DISTDIR)/samples/html/about/data
+ cp $(SAMPDIR)/html/about/data/*.htm $(DISTDIR)/samples/html/about/data
+ cp $(SAMPDIR)/html/about/data/*.png $(DISTDIR)/samples/html/about/data
+ mkdir $(DISTDIR)/samples/html/help
+ cp $(SAMPDIR)/html/help/Makefile.in $(DISTDIR)/samples/html/help
+ cp $(SAMPDIR)/html/help/*.cpp $(DISTDIR)/samples/html/help
+ mkdir $(DISTDIR)/samples/html/help/helpfiles
+ 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
+ cp $(SAMPDIR)/html/test/*.cpp $(DISTDIR)/samples/html/test
+ cp $(SAMPDIR)/html/test/*.bmp $(DISTDIR)/samples/html/test
+ cp $(SAMPDIR)/html/test/*.png $(DISTDIR)/samples/html/test
+ cp $(SAMPDIR)/html/test/*.htm $(DISTDIR)/samples/html/test
+ cp $(SAMPDIR)/html/test/*.html $(DISTDIR)/samples/html/test
+ mkdir $(DISTDIR)/samples/html/virtual
+ cp $(SAMPDIR)/html/virtual/Makefile.in $(DISTDIR)/samples/html/virtual
+ cp $(SAMPDIR)/html/virtual/*.cpp $(DISTDIR)/samples/html/virtual
+ cp $(SAMPDIR)/html/virtual/*.htm $(DISTDIR)/samples/html/virtual
+ mkdir $(DISTDIR)/samples/html/widget
+ cp $(SAMPDIR)/html/widget/Makefile.in $(DISTDIR)/samples/html/widget
+ cp $(SAMPDIR)/html/widget/*.cpp $(DISTDIR)/samples/html/widget
+ cp $(SAMPDIR)/html/widget/*.htm $(DISTDIR)/samples/html/widget
+ mkdir $(DISTDIR)/samples/html/zip
+ cp $(SAMPDIR)/html/zip/Makefile.in $(DISTDIR)/samples/html/zip
+ cp $(SAMPDIR)/html/zip/*.cpp $(DISTDIR)/samples/html/zip
+ cp $(SAMPDIR)/html/zip/*.htm $(DISTDIR)/samples/html/zip
+ cp $(SAMPDIR)/html/zip/*.zip $(DISTDIR)/samples/html/zip
+ mkdir $(DISTDIR)/samples/image
+ 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/layout
+ cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout
+ cp $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout
+ cp $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout
+ mkdir $(DISTDIR)/samples/listctrl
+ cp $(SAMPDIR)/listctrl/Makefile.in $(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/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/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/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/notebook
+ 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/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/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/*.cpp $(DISTDIR)/samples/scroll
+ mkdir $(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/*.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/*.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/*.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/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
+ cp $(SAMPDIR)/wxsocket/*.xpm $(DISTDIR)/samples/wxsocket
+
+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
+ 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
+ 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)
+
+dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST
cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
$(RM) -r _dist_dir
diff --git a/docs/gtk/changes.txt b/docs/gtk/changes.txt
index 089549410f..9252a4f586 100644
--- a/docs/gtk/changes.txt
+++ b/docs/gtk/changes.txt
@@ -2,12 +2,65 @@
28th August '99: Ninth wxGTK 2.1 snapshot released
As the old makefile system didn't work, I trashed it and wrote
-a new one. It does work on Linux and Solaris but anything else
-is untested.
+a new one - mo more GNU. This, of course, caused a lot of people
+to start sing their song of complaints - any change is a good
+opportunity to complain, but the effect of the change is that
+we now have shared library support on Linux and Solaris (and
+probably others as well) and that the Linux shared library no
+longer depends on libstdc++, so that we can finally create an
+RPM that works on different Linux distributions. Also, the
+Unix make system is now much simpler and directly mirrors its
+Windows counterparts, making it easier to understand and maintain.
+As it is independent of the various GNU tools, the requirements
+for using CVS versions are also much less (any make, any compiler,
+no other tools).
+
+Split RPMs into two, one for run-time requirements and one
+for developement (mostly headers).
Addition of new layout classes that work like Java's, GTK's
or Qt`s - basically, you pack item in a box and let it tell
-you how much space it needs.
+you how much space it needs. These class are called wxSizer
+and I consider them a great addition as they make true cross-
+platform dialogs a child's play and are very quick to write
+and easy to read. Do consider using them.
+
+Rewritten all dialogs to make use of the new sizers. Also
+added a new wxFileDialog like Win95 and replaced the generic
+wxFontDialog with GTK's native font selection dialog - this
+probably isn't perfect though.
+
+A few more fixes to wxListCtrl and wxTreeCtrl, implemented
+more options and modes like the wxMSW version.
+
+New handler for PNM files. Added CanRead() function to image
+handlers, updates to GIF handler for preparing the new wxAnimation
+class. We'll also get a PCX and hopefully a TIFF handler so
+that we support all common general-purpose file formats I know
+about. PhotoShop and PhotoPaint images are not general purpose.
+I also tried to correct a wxImage bug in connection with big-endian
+vs. little-endian problems, but I have no Sparc to actually test
+this.
+
+Inclusion of wxMultiMedia. Can play most sound formats on GTK
+and MSW and (using xanim on Unix and Win95's MM functions)
+display a video in a wxWindow. This will probably be moved to
+the core library.
+
+Small updates to socket code. The MSW version is still missing.
+
+Implemented wxBitmapDataObject class.
+
+Added wxFFileStream using FILE* instead if file desrcriptor.
+Useful for creating a "cerr" like class as in normal C++.
+Also added "endl" for use with wxTextStream and fixed a few
+minor problems with buffered streams etc.
+
+Corrected Tabbing code in wxPanel and made it work with wxNotebook.
+
+Small cursor fixes in connection with text control.
+
+Added experimental wxWizard class. Work in progress.
A few more minor fixes.
diff --git a/docs/gtk/todo.txt b/docs/gtk/todo.txt
index 92adcfb9e9..12037f5f26 100644
--- a/docs/gtk/todo.txt
+++ b/docs/gtk/todo.txt
@@ -3,6 +3,10 @@
Finalise DnD API.
+Fix bug that thread sample reports about non-finished threads.
+
+Added wxExpandedImageList to wxTreeControl.
+
More testing of Unicode support.
Make wxSockets work on all platform.
@@ -10,7 +14,7 @@ Make wxSockets work on all platform.
Add ID based i18n system as a replacement for the
unelegant gettext system.
-Add controls to toolbar.
+Add controls to wxToolbar.
Add TIFF handler. Someone? (Hint, hint).
diff --git a/docs/symbols.txt b/docs/symbols.txt
index 2eb06a06f2..633162fb30 100644
--- a/docs/symbols.txt
+++ b/docs/symbols.txt
@@ -11,6 +11,7 @@ __WXGTK12__ GTK 1.2 or higher
__WXMSW__ Any Windows
__WXWINE__ WINE (i.e. Win32 on Unix)
__WXMAC__ MacOS
+__WXPM__ OS/2 native Presentation Manager
__UNIX__ any Unix
__WINDOWS__ any Windows
__WIN95__ GUI for Windows 95 and above; NT 4.0 and above.
diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index d02d3a75f8..cd5731f969 100644
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -34,7 +34,7 @@ install_dirs:
install_data:
@list='$(DATAFILES)'; for p in $$list; do \
if test ! -s $(top_builddir)/$(program_dir)/$$p; then \
- cp -u $(top_srcdir)/$(program_dir)/$$p $(top_builddir)/$(program_dir)/$$p; \
+ cp -f $(top_srcdir)/$(program_dir)/$$p $(top_builddir)/$(program_dir)/$$p; \
fi; \
done
diff --git a/utils/glcanvas/Makefile.in b/utils/glcanvas/Makefile.in
new file mode 100644
index 0000000000..1a811e8389
--- /dev/null
+++ b/utils/glcanvas/Makefile.in
@@ -0,0 +1,3 @@
+all:
+ cd @TOOLKIT_DIR@; make
+ cd samples; make
diff --git a/utils/glcanvas/gtk/Makefile.in b/utils/glcanvas/gtk/Makefile.in
new file mode 100644
index 0000000000..510056e31e
--- /dev/null
+++ b/utils/glcanvas/gtk/Makefile.in
@@ -0,0 +1,22 @@
+#
+# File: Makefile
+# Author: Robert Roebling
+# Created: 1999
+# Updated:
+# Copyright: (c) 1998 Robert Roebling
+#
+# "%W% %G%"
+#
+# Makefile for wxMultiMedia (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../../..
+
+VPATH= $(top_srcdir)/utils/glcanvas/gtk
+
+LIBTARGET=libwxglcanvas
+
+OBJECTS=glcanvas.o
+
+include $(top_builddir)/src/makelib.env
+
diff --git a/utils/wxMMedia2/lib/Makefile.in b/utils/wxMMedia2/lib/Makefile.in
index ee1d2fb46a..310d9b9628 100644
--- a/utils/wxMMedia2/lib/Makefile.in
+++ b/utils/wxMMedia2/lib/Makefile.in
@@ -1,13 +1,13 @@
#
-# File: makefile.unx
-# Author: Julian Smart
+# File: Makefile
+# Author: Guilhem Lavaux
# Created: 1998
# Updated:
# Copyright: (c) 1998 Julian Smart
#
# "%W% %G%"
#
-# Makefile for thread example (UNIX).
+# Makefile for wxMultiMedia (UNIX).
top_srcdir = @top_srcdir@
top_builddir = ../../..
diff --git a/wx-config.in b/wx-config.in
index 6c0f4262a8..a93c4af969 100755
--- a/wx-config.in
+++ b/wx-config.in
@@ -36,7 +36,7 @@ while test $# -gt 0; do
echo $exec_prefix
;;
--version)
- echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@
+ echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@ snapshot 9
;;
--cflags)
if test @includedir@ != /usr/include ; then
diff --git a/wxGTK.spec b/wxGTK.spec
index 2f53edd46a..254252822b 100644
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -25,6 +25,14 @@ wxWindows is a free C++ library for cross-platform GUI development.
With wxWindows, you can create applications for different GUIs (GTK+,
Motif/LessTif, MS Windows, Mac) from the same source code.
+%package devel
+Summary: The GTK+ 1.2 port of the wxWindows library
+Group: X11/Libraries
+Requires: wxGTK
+
+%description devel
+Header files for the wxGTK, the GTK+ 1.2 port of the wxWindows library.
+
%prep
%setup -n wxGTK
./configure --prefix=%{pref} --enable-threads --disable-std_iostreams
@@ -48,12 +56,15 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr (644, root, root, 755)
%doc COPYING.LIB INSTALL.txt LICENCE.txt README.txt SYMBOLS.txt TODO.txt
+%dir %{pref}/share/wx
+%{pref}/share/wx/*
+%attr(755, -, -) %{pref}/lib/libwx_gtk*
+
+%files devel
+%defattr (644, root, root, 755)
%dir %{pref}/include/wx
%{pref}/include/wx/*
%dir %{pref}/lib/wx
%{pref}/lib/wx/*
-%dir %{pref}/share/wx
-%{pref}/share/wx/*
-%attr(755, -, -) %{pref}/lib/libwx_gtk*
%attr(755, -, -) %{pref}/bin/wx-config