Motif compile fixes

[wxWidgets.git] / distrib / gtk / copy_src

diff --git a/distrib/gtk/copy_src b/distrib/gtk/copy_src
index 1233b6aa0702be10c5cc7830dc43b3ba7ff430fc..67c68fa076dd1d1f85042d5a6c2a490f9fc21878 100755 (executable)
--- a/distrib/gtk/copy_src
+++ b/distrib/gtk/copy_src
@@ -15,21 +15,30 @@ echo Base dir..
 
 cd ../..
 cp wxGTK.spec ~/wxgtk_dist/wxGTK
-cp Makefile ~/wxgtk_dist/wxGTK
-cp configure ~/wxgtk_dist/wxGTK
+cp Makefile.am ~/wxgtk_dist/wxGTK
+cp acconfig.h ~/wxgtk_dist/wxGTK
+cp acinclude.m4 ~/wxgtk_dist/wxGTK
+cp aclocal.m4 ~/wxgtk_dist/wxGTK
 cp configure.in ~/wxgtk_dist/wxGTK
+cp configure ~/wxgtk_dist/wxGTK
 cp config.sub ~/wxgtk_dist/wxGTK
 cp config.guess ~/wxgtk_dist/wxGTK
 cp install-sh ~/wxgtk_dist/wxGTK
+cp ltconfig ~/wxgtk_dist/wxGTK
+cp ltmain.sh ~/wxgtk_dist/wxGTK
+cp missing ~/wxgtk_dist/wxGTK
 cp mkinstalldirs ~/wxgtk_dist/wxGTK
-cp template.mak ~/wxgtk_dist/wxGTK
 cp wx-config.in ~/wxgtk_dist/wxGTK
+cp setup.h.in ~/wxgtk_dist/wxGTK
+cp stamp-h.in ~/wxgtk_dist/wxGTK
+cp Makefile.in ~/wxgtk_dist/wxGTK
 
 echo Docs..
 
 cd docs/gtk
 cp COPYING.LIB ~/wxgtk_dist/wxGTK
 cp install.txt ~/wxgtk_dist/wxGTK/INSTALL.txt
+cp changes.txt ~/wxgtk_dist/wxGTK/CHANGES.txt
 cp licence.txt ~/wxgtk_dist/wxGTK/LICENCE.txt
 cp readme.txt ~/wxgtk_dist/wxGTK/README.txt
 cp todo.txt ~/wxgtk_dist/wxGTK/TODO.txt
@@ -41,115 +50,108 @@ echo Include dir..
 
 mkdir ~/wxgtk_dist/wxGTK/include
 cd include
-cp install-sh ~/wxgtk_dist/wxGTK/include
+cp Makefile.am ~/wxgtk_dist/wxGTK/include
+cp Makefile.in ~/wxgtk_dist/wxGTK/include
 
 mkdir ~/wxgtk_dist/wxGTK/include/wx
 cd wx
-cp install-sh ~/wxgtk_dist/wxGTK/include/wx
 cp *.h ~/wxgtk_dist/wxGTK/include/wx
 cp *.cpp ~/wxgtk_dist/wxGTK/include/wx
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx
+cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx
 
 mkdir ~/wxgtk_dist/wxGTK/include/wx/generic
 cd generic
 cp *.h ~/wxgtk_dist/wxGTK/include/wx/generic
+cp *.xpm ~/wxgtk_dist/wxGTK/include/wx/generic
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/generic
+cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/generic
+cd ..
+
+mkdir ~/wxgtk_dist/wxGTK/include/wx/unix
+cd unix
+cp *.h ~/wxgtk_dist/wxGTK/include/wx/unix
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/unix
+cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/unix
 cd ..
 
 mkdir ~/wxgtk_dist/wxGTK/include/wx/gtk
 cd gtk
 cp *.h ~/wxgtk_dist/wxGTK/include/wx/gtk
 rm ~/wxgtk_dist/wxGTK/include/wx/gtk/setup.h
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/gtk
+cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/gtk
 cd ..
 
-mkdir ~/wxgtk_dist/wxGTK/include/wx/protocol
-cd protocol
-cp *.h ~/wxgtk_dist/wxGTK/include/wx/protocol
+mkdir ~/wxgtk_dist/wxGTK/include/wx/motif
+cd motif
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/motif
+cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/motif
 cd ..
 
-cd ..
+mkdir ~/wxgtk_dist/wxGTK/include/wx/msw
+cd msw
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/msw
+cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/msw
 cd ..
 
-echo Base lib..
+mkdir ~/wxgtk_dist/wxGTK/include/wx/protocol
+cd protocol
+cp *.h ~/wxgtk_dist/wxGTK/include/wx/protocol
+cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/protocol
+cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/protocol
+cd ..
 
-mkdir ~/wxgtk_dist/wxGTK/lib
-cp ./lib/dummy ~/wxgtk_dist/wxGTK/lib
+cd ../..
 
 echo Misc dir..
 
 mkdir ~/wxgtk_dist/wxGTK/misc
+cd misc
+cp Makefile.am ~/wxgtk_dist/wxGTK/misc
+cp Makefile.in ~/wxgtk_dist/wxGTK/misc
 mkdir ~/wxgtk_dist/wxGTK/misc/afm
-mkdir ~/wxgtk_dist/wxGTK/misc/gs_afm
-
-cp ./misc/afm/*.afm ~/wxgtk_dist/wxGTK/misc/afm
-cp ./misc/gs_afm/*.afm ~/wxgtk_dist/wxGTK/misc/gs_afm
-
-echo Setup dir..
-
-cd setup
-mkdir ~/wxgtk_dist/wxGTK/setup
-cp maketmpl.in ~/wxgtk_dist/wxGTK/setup
-cp setup.hin ~/wxgtk_dist/wxGTK/setup
-cp substit.in ~/wxgtk_dist/wxGTK/setup
-
-cd general
-mkdir ~/wxgtk_dist/wxGTK/setup/general
-cp createall ~/wxgtk_dist/wxGTK/setup/general
-cp jointar ~/wxgtk_dist/wxGTK/setup/general
-cp makeapp ~/wxgtk_dist/wxGTK/setup/general
-cp makedirs ~/wxgtk_dist/wxGTK/setup/general
-cp makedoc ~/wxgtk_dist/wxGTK/setup/general
-cp mygrep ~/wxgtk_dist/wxGTK/setup/general
-cp needed ~/wxgtk_dist/wxGTK/setup/general
-cd ..
-
-cd rules
-mkdir ~/wxgtk_dist/wxGTK/setup/rules
-cp * ~/wxgtk_dist/wxGTK/setup/rules
-
-cd generic
-mkdir ~/wxgtk_dist/wxGTK/setup/rules/generic
-cp * ~/wxgtk_dist/wxGTK/setup/rules/generic
-cd ..
-
-cd ..
-
-cd shared
-mkdir ~/wxgtk_dist/wxGTK/setup/shared
-cp * ~/wxgtk_dist/wxGTK/setup/shared
-cd ..
-
-cd ..
-
-echo User dir..
-
-cd src
-mkdir ~/wxgtk_dist/wxGTK/user
-cp Makefile ~/wxgtk_dist/wxGTK/user
+cd afm
+cp *.afm ~/wxgtk_dist/wxGTK/misc/afm
+cp Makefile.am ~/wxgtk_dist/wxGTK/misc/afm
+cp Makefile.in ~/wxgtk_dist/wxGTK/misc/afm
 cd ..
+mkdir ~/wxgtk_dist/wxGTK/misc/gs_afm
+cd gs_afm
+cp *.afm ~/wxgtk_dist/wxGTK/misc/gs_afm
+cp Makefile.am ~/wxgtk_dist/wxGTK/misc/gs_afm
+cp Makefile.in ~/wxgtk_dist/wxGTK/misc/gs_afm
+cd ../..
 
 echo Src dir..
 
 cd src
 mkdir ~/wxgtk_dist/wxGTK/src
-cp Makefile ~/wxgtk_dist/wxGTK/src
+cp Makefile.am ~/wxgtk_dist/wxGTK/src
 cp Makefile.in ~/wxgtk_dist/wxGTK/src
-cp gtk.inc ~/wxgtk_dist/wxGTK/src
+
+cd gtk
+mkdir ~/wxgtk_dist/wxGTK/src/gtk
+cp Makefile.am ~/wxgtk_dist/wxGTK/src/gtk
+cp Makefile.in ~/wxgtk_dist/wxGTK/src/gtk
+cp *.xbm ~/wxgtk_dist/wxGTK/src/gtk
+cp *.c ~/wxgtk_dist/wxGTK/src/gtk
+cp *.inc ~/wxgtk_dist/wxGTK/src/gtk
+cp *.cpp ~/wxgtk_dist/wxGTK/src/gtk
+cd ..
 
 cd common
 mkdir ~/wxgtk_dist/wxGTK/src/common
 cp glob.inc ~/wxgtk_dist/wxGTK/src/common
 cp lexer.l ~/wxgtk_dist/wxGTK/src/common
 cp parser.y ~/wxgtk_dist/wxGTK/src/common
-cp y_tab.c ~/wxgtk_dist/wxGTK/src/common
 cp extended.c ~/wxgtk_dist/wxGTK/src/common
 cp *.cpp ~/wxgtk_dist/wxGTK/src/common
 cd ..
 
-cd gtk
-mkdir ~/wxgtk_dist/wxGTK/src/gtk
-cp *.xbm ~/wxgtk_dist/wxGTK/src/gtk
-cp *.c ~/wxgtk_dist/wxGTK/src/gtk
-cp *.inc ~/wxgtk_dist/wxGTK/src/gtk
-cp *.cpp ~/wxgtk_dist/wxGTK/src/gtk
+cd unix
+mkdir ~/wxgtk_dist/wxGTK/src/unix
+cp *.cpp ~/wxgtk_dist/wxGTK/src/unix
 cd ..
 
 cd generic
@@ -172,13 +174,21 @@ mkdir ~/wxgtk_dist/wxGTK/src/png
 cp * ~/wxgtk_dist/wxGTK/src/png
 cd ..
 
+cd jpeg
+mkdir ~/wxgtk_dist/wxGTK/src/jpeg
+cp * ~/wxgtk_dist/wxGTK/src/jpeg
+cd ..
+
 cd ..
 
 echo Utils dir..
 
 cd utils
 mkdir ~/wxgtk_dist/wxGTK/utils
-cp Makefile ~/wxgtk_dist/wxGTK/utils
+cp Makefile.am ~/wxgtk_dist/wxGTK/utils
+cp Makefile.in ~/wxgtk_dist/wxGTK/utils
+
+echo wxGLCanvas..
 
 cd glcanvas
 mkdir ~/wxgtk_dist/wxGTK/utils/glcanvas
@@ -217,6 +227,8 @@ cp lw.cpp ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/penguin
 cp penguin.lwo ~/wxgtk_dist/wxGTK/utils/glcanvas/samples/penguin
 cd ../../..
 
+echo DialogEd..
+
 cd dialoged/src
 mkdir ~/wxgtk_dist/wxGTK/utils/dialoged
 cp Makefile ~/wxgtk_dist/wxGTK/utils/dialoged
@@ -243,31 +255,66 @@ mkdir ~/wxgtk_dist/wxGTK/utils/dialoged/bitmaps
 cp *.xpm ~/wxgtk_dist/wxGTK/utils/dialoged/bitmaps
 cd ../../..
 
+echo wxPython..
+
 cd wxPython
 mkdir ~/wxgtk_dist/wxGTK/utils/wxPython
 cp README.txt ~/wxgtk_dist/wxGTK/utils/wxPython
-cp TODO.txt ~/wxgtk_dist/wxGTK/utils/wxPython
+
 mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/src
 cp ./src/* ~/wxgtk_dist/wxGTK/utils/wxPython/src
+
 mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/src/gtk
 cp ./src/gtk/* ~/wxgtk_dist/wxGTK/utils/wxPython/src/gtk
+
+mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/lib
+cp ./lib/*.py ~/wxgtk_dist/wxGTK/utils/wxPython/lib
+mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/lib/sizers
+cp ./lib/sizers/*.py ~/wxgtk_dist/wxGTK/utils/wxPython/lib/sizers
+
 mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/tests
+cp ./tests/README.txt ~/wxgtk_dist/wxGTK/utils/wxPython/tests
 cp ./tests/*.py ~/wxgtk_dist/wxGTK/utils/wxPython/tests
+
+mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/demo
+cp ./demo/README.txt ~/wxgtk_dist/wxGTK/utils/wxPython/demo
+cp ./demo/*.py ~/wxgtk_dist/wxGTK/utils/wxPython/demo
+cp ./demo/*.pyc ~/wxgtk_dist/wxGTK/utils/wxPython/demo
+mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/demo/bitmaps
+cp ./demo/bitmaps/* ~/wxgtk_dist/wxGTK/utils/wxPython/demo/bitmaps
+
 mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/tests/bitmaps
 cp ./tests/bitmaps/* ~/wxgtk_dist/wxGTK/utils/wxPython/tests/bitmaps
+cd ..
+
+echo wxOLE..
+
+cd wxOLE
+mkdir ~/wxgtk_dist/wxGTK/utils/wxOLE
+mkdir ~/wxgtk_dist/wxGTK/utils/wxOLE/gtk
+cp ./gtk/wxole.* ~/wxgtk_dist/wxGTK/utils/wxOLE/gtk
+mkdir ~/wxgtk_dist/wxGTK/utils/wxOLE/samples
+mkdir ~/wxgtk_dist/wxGTK/utils/wxOLE/samples/servlet
+cp ./samples/servlet/Makefile ~/wxgtk_dist/wxGTK/utils/wxOLE/samples/servlet
+cp ./samples/servlet/*.xpm ~/wxgtk_dist/wxGTK/utils/wxOLE/samples/servlet
+cp ./samples/servlet/*.cpp ~/wxgtk_dist/wxGTK/utils/wxOLE/samples/servlet
+cp ./samples/servlet/*.gnorba ~/wxgtk_dist/wxGTK/utils/wxOLE/samples/servlet
+
 cd ../..
 
+
 echo Samples dir..
 
 cd samples
 mkdir ~/wxgtk_dist/wxGTK/samples
-cp Makefile ~/wxgtk_dist/wxGTK/samples
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples
 
 echo Minimal sample..
 
 cd minimal
 mkdir ~/wxgtk_dist/wxGTK/samples/minimal
-cp Makefile ~/wxgtk_dist/wxGTK/samples/minimal
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/minimal
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/minimal
 cp minimal.cpp ~/wxgtk_dist/wxGTK/samples/minimal
 cp mondrian.xpm ~/wxgtk_dist/wxGTK/samples/minimal
@@ -277,18 +324,28 @@ echo Bombs sample..
 
 cd bombs
 mkdir ~/wxgtk_dist/wxGTK/samples/bombs
-cp Makefile ~/wxgtk_dist/wxGTK/samples/bombs
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/bombs
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/bombs
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/bombs
 cp *.h ~/wxgtk_dist/wxGTK/samples/bombs
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/bombs
 cd ..
 
+echo Caret sample..
+
+cd caret
+mkdir ~/wxgtk_dist/wxGTK/samples/caret
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/caret
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/caret
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/caret
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/caret
+cd ..
+
 echo Checklst sample..
 
 cd checklst
 mkdir ~/wxgtk_dist/wxGTK/samples/checklst
-cp Makefile ~/wxgtk_dist/wxGTK/samples/checklst
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/checklst
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/checklst
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/checklst
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/checklst
@@ -298,7 +355,7 @@ echo Config sample..
 
 cd config
 mkdir ~/wxgtk_dist/wxGTK/samples/config
-cp Makefile ~/wxgtk_dist/wxGTK/samples/config
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/config
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/config
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/config
 cd ..
@@ -307,7 +364,7 @@ echo Controls sample..
 
 cd controls
 mkdir ~/wxgtk_dist/wxGTK/samples/controls
-cp Makefile ~/wxgtk_dist/wxGTK/samples/controls
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/controls
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/controls
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/controls
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/controls
@@ -320,7 +377,7 @@ echo Db sample..
 
 cd db
 mkdir ~/wxgtk_dist/wxGTK/samples/db
-cp Makefile ~/wxgtk_dist/wxGTK/samples/db
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/db
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/db
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/db
 cp *.h ~/wxgtk_dist/wxGTK/samples/db
@@ -331,7 +388,7 @@ echo DDE sample..
 
 cd dde
 mkdir ~/wxgtk_dist/wxGTK/samples/dde
-cp Makefile ~/wxgtk_dist/wxGTK/samples/dde
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/dde
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/dde
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/dde
 cp *.h ~/wxgtk_dist/wxGTK/samples/dde
@@ -342,7 +399,7 @@ echo Dialogs sample..
 
 cd dialogs
 mkdir ~/wxgtk_dist/wxGTK/samples/dialogs
-cp Makefile ~/wxgtk_dist/wxGTK/samples/dialogs
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/dialogs
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/dialogs
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/dialogs
 cp *.h ~/wxgtk_dist/wxGTK/samples/dialogs
@@ -352,7 +409,7 @@ echo DnD sample..
 
 cd dnd
 mkdir ~/wxgtk_dist/wxGTK/samples/dnd
-cp Makefile ~/wxgtk_dist/wxGTK/samples/dnd
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/dnd
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/dnd
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/dnd
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/dnd
@@ -362,7 +419,7 @@ echo Docview sample..
 
 cd docview
 mkdir ~/wxgtk_dist/wxGTK/samples/docview
-cp Makefile ~/wxgtk_dist/wxGTK/samples/docview
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/docview
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/docview
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/docview
 cp *.h ~/wxgtk_dist/wxGTK/samples/docview
@@ -373,7 +430,7 @@ echo DocvwMDI sample..
 
 cd docvwmdi
 mkdir ~/wxgtk_dist/wxGTK/samples/docvwmdi
-cp Makefile ~/wxgtk_dist/wxGTK/samples/docvwmdi
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/docvwmdi
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/docvwmdi
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/docvwmdi
 cp *.h ~/wxgtk_dist/wxGTK/samples/docvwmdi
@@ -383,17 +440,27 @@ echo Dynamic sample..
 
 cd dynamic
 mkdir ~/wxgtk_dist/wxGTK/samples/dynamic
-cp Makefile ~/wxgtk_dist/wxGTK/samples/dynamic
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/dynamic
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/dynamic
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/dynamic
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/dynamic
 cd ..
 
+echo Drawing sample..
+
+cd drawing
+mkdir ~/wxgtk_dist/wxGTK/samples/drawing
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/drawing
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/drawing
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/drawing
+cp *.xpm ~/wxgtk_dist/wxGTK/samples/drawing
+cd ..
+
 echo Forty sample..
 
 cd forty
 mkdir ~/wxgtk_dist/wxGTK/samples/forty
-cp Makefile ~/wxgtk_dist/wxGTK/samples/forty
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/forty
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/forty
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/forty
 cp *.h ~/wxgtk_dist/wxGTK/samples/forty
@@ -405,7 +472,7 @@ echo Fractal sample..
 
 cd fractal
 mkdir ~/wxgtk_dist/wxGTK/samples/fractal
-cp Makefile ~/wxgtk_dist/wxGTK/samples/fractal
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/fractal
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/fractal
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/fractal
 cd ..
@@ -414,7 +481,7 @@ echo Grid sample..
 
 cd grid
 mkdir ~/wxgtk_dist/wxGTK/samples/grid
-cp Makefile ~/wxgtk_dist/wxGTK/samples/grid
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/grid
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/grid
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/grid
 cd ..
@@ -423,7 +490,7 @@ echo Help sample..
 
 cd help
 mkdir ~/wxgtk_dist/wxGTK/samples/help
-cp Makefile ~/wxgtk_dist/wxGTK/samples/help
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/help
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/help
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/help
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/help
@@ -436,17 +503,19 @@ echo Image sample..
 
 cd image
 mkdir ~/wxgtk_dist/wxGTK/samples/image
-cp Makefile ~/wxgtk_dist/wxGTK/samples/image
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/image
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/image
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/image
 cp horse.png ~/wxgtk_dist/wxGTK/samples/image
+cp horse.gif ~/wxgtk_dist/wxGTK/samples/image
+cp horse.jpg ~/wxgtk_dist/wxGTK/samples/image
 cd ..
 
 echo Internat sample..
 
 cd internat
 mkdir ~/wxgtk_dist/wxGTK/samples/internat
-cp Makefile ~/wxgtk_dist/wxGTK/samples/internat
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/internat
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/internat
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/internat
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/internat
@@ -461,7 +530,7 @@ echo Layout sample..
 
 cd layout
 mkdir ~/wxgtk_dist/wxGTK/samples/layout
-cp Makefile ~/wxgtk_dist/wxGTK/samples/layout
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/layout
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/layout
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/layout
 cp *.h ~/wxgtk_dist/wxGTK/samples/layout
@@ -471,7 +540,7 @@ echo Listctrl sample..
 
 cd listctrl
 mkdir ~/wxgtk_dist/wxGTK/samples/listctrl
-cp Makefile ~/wxgtk_dist/wxGTK/samples/listctrl
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/listctrl
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/listctrl
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/listctrl
 cp *.h ~/wxgtk_dist/wxGTK/samples/listctrl
@@ -485,7 +554,7 @@ echo MDI sample..
 
 cd mdi
 mkdir ~/wxgtk_dist/wxGTK/samples/mdi
-cp Makefile ~/wxgtk_dist/wxGTK/samples/mdi
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/mdi
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/mdi
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/mdi
 cp *.h ~/wxgtk_dist/wxGTK/samples/mdi
@@ -499,7 +568,7 @@ echo Memcheck sample..
 
 cd memcheck
 mkdir ~/wxgtk_dist/wxGTK/samples/memcheck
-cp Makefile ~/wxgtk_dist/wxGTK/samples/memcheck
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/memcheck
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/memcheck
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/memcheck
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/memcheck
@@ -509,7 +578,7 @@ echo Minifram sample..
 
 cd minifram
 mkdir ~/wxgtk_dist/wxGTK/samples/minifram
-cp Makefile ~/wxgtk_dist/wxGTK/samples/minifram
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/minifram
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/minifram
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/minifram
 cp *.h ~/wxgtk_dist/wxGTK/samples/minifram
@@ -523,7 +592,7 @@ echo Notebook sample..
 
 cd notebook
 mkdir ~/wxgtk_dist/wxGTK/samples/notebook
-cp Makefile ~/wxgtk_dist/wxGTK/samples/notebook
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/notebook
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/notebook
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/notebook
 cp *.h ~/wxgtk_dist/wxGTK/samples/notebook
@@ -533,7 +602,7 @@ echo PNG sample..
 
 cd png
 mkdir ~/wxgtk_dist/wxGTK/samples/png
-cp Makefile ~/wxgtk_dist/wxGTK/samples/png
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/png
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/png
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/png
 cp *.h ~/wxgtk_dist/wxGTK/samples/png
@@ -544,7 +613,7 @@ echo Printing sample..
 
 cd printing
 mkdir ~/wxgtk_dist/wxGTK/samples/printing
-cp Makefile ~/wxgtk_dist/wxGTK/samples/printing
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/printing
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/printing
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/printing
 cp *.h ~/wxgtk_dist/wxGTK/samples/printing
@@ -555,7 +624,7 @@ echo Proplist sample..
 
 cd proplist
 mkdir ~/wxgtk_dist/wxGTK/samples/proplist
-cp Makefile ~/wxgtk_dist/wxGTK/samples/proplist
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/proplist
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/proplist
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/proplist
 cp *.h ~/wxgtk_dist/wxGTK/samples/proplist
@@ -565,7 +634,7 @@ echo Resource sample..
 
 cd resource
 mkdir ~/wxgtk_dist/wxGTK/samples/resource
-cp Makefile ~/wxgtk_dist/wxGTK/samples/resource
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/resource
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/resource
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/resource
 cp *.h ~/wxgtk_dist/wxGTK/samples/resource
@@ -576,17 +645,27 @@ echo Sashtest sample..
 
 cd sashtest
 mkdir ~/wxgtk_dist/wxGTK/samples/sashtest
-cp Makefile ~/wxgtk_dist/wxGTK/samples/sashtest
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/sashtest
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/sashtest
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/sashtest
 cp *.h ~/wxgtk_dist/wxGTK/samples/sashtest
 cd ..
 
+echo Scroll sample..
+
+cd sashtest
+mkdir ~/wxgtk_dist/wxGTK/samples/scroll
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/scroll
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/scroll
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/scroll
+cp *.h ~/wxgtk_dist/wxGTK/samples/scroll
+cd ..
+
 echo Splitter sample..
 
 cd splitter
 mkdir ~/wxgtk_dist/wxGTK/samples/splitter
-cp Makefile ~/wxgtk_dist/wxGTK/samples/splitter
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/splitter
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/splitter
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/splitter
 cd ..
@@ -595,17 +674,26 @@ echo Tab sample..
 
 cd tab
 mkdir ~/wxgtk_dist/wxGTK/samples/tab
-cp Makefile ~/wxgtk_dist/wxGTK/samples/tab
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/tab
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/tab
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/tab
 cp *.h ~/wxgtk_dist/wxGTK/samples/tab
 cd ..
 
+echo Text sample..
+
+cd text
+mkdir ~/wxgtk_dist/wxGTK/samples/text
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/text
+cp Makefile.in ~/wxgtk_dist/wxGTK/samples/text
+cp *.cpp ~/wxgtk_dist/wxGTK/samples/text
+cd ..
+
 echo Thread sample..
 
 cd thread
 mkdir ~/wxgtk_dist/wxGTK/samples/thread
-cp Makefile ~/wxgtk_dist/wxGTK/samples/thread
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/thread
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/thread
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/thread
 cd ..
@@ -614,7 +702,7 @@ echo Toolbar sample..
 
 cd toolbar
 mkdir ~/wxgtk_dist/wxGTK/samples/toolbar
-cp Makefile ~/wxgtk_dist/wxGTK/samples/toolbar
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/toolbar
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/toolbar
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/toolbar
 cp *.h ~/wxgtk_dist/wxGTK/samples/toolbar
@@ -628,7 +716,7 @@ echo TreeCtrl sample..
 
 cd treectrl
 mkdir ~/wxgtk_dist/wxGTK/samples/treectrl
-cp Makefile ~/wxgtk_dist/wxGTK/samples/treectrl
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/treectrl
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/treectrl
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/treectrl
 cp *.h ~/wxgtk_dist/wxGTK/samples/treectrl
@@ -639,7 +727,7 @@ echo typetest sample..
 
 cd typetest
 mkdir ~/wxgtk_dist/wxGTK/samples/typetest
-cp Makefile ~/wxgtk_dist/wxGTK/samples/typetest
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/typetest
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/typetest
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/typetest
 cp *.h ~/wxgtk_dist/wxGTK/samples/typetest
@@ -650,7 +738,7 @@ echo Validate sample..
 
 cd validate
 mkdir ~/wxgtk_dist/wxGTK/samples/validate
-cp Makefile ~/wxgtk_dist/wxGTK/samples/validate
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/validate
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/validate
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/validate
 cp *.h ~/wxgtk_dist/wxGTK/samples/validate
@@ -661,7 +749,7 @@ echo wxPoem sample..
 
 cd wxpoem
 mkdir ~/wxgtk_dist/wxGTK/samples/wxpoem
-cp Makefile ~/wxgtk_dist/wxGTK/samples/wxpoem
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/wxpoem
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/wxpoem
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/wxpoem
 cp *.h ~/wxgtk_dist/wxGTK/samples/wxpoem
@@ -675,7 +763,7 @@ echo wxSocket sample..
 
 cd wxsocket
 mkdir ~/wxgtk_dist/wxGTK/samples/wxsocket
-cp Makefile ~/wxgtk_dist/wxGTK/samples/wxsocket
+cp Makefile.am ~/wxgtk_dist/wxGTK/samples/wxsocket
 cp Makefile.in ~/wxgtk_dist/wxGTK/samples/wxsocket
 cp *.cpp ~/wxgtk_dist/wxGTK/samples/wxsocket
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/wxsocket
@@ -687,5 +775,5 @@ cd distrib/gtk
 cp README.txt ~/wxgtk_dist/wxGTK/utils/wxPython
 cp Setup ~/wxgtk_dist/wxGTK/utils/wxPython/src
 
-
-
+cd ~/wxgtk_dist
+tar ch wxGTK | gzip -f9 > wxGTK-2.1.0-b7.tgz