X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e183484e412db7b6b0309291c13f5f0c2053911c..5dd26b083956439f0147c134e9365c222fba3726:/distrib/msw/tmake/unx.t

diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t
index 32262da7bd..38a6514efb 100644
--- a/distrib/msw/tmake/unx.t
+++ b/distrib/msw/tmake/unx.t
@@ -332,6 +332,7 @@ PMDIR    = $(WXDIR)/src/os2
 ODBCDIR  = $(WXDIR)/src/iodbc
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
+DEMODIR  = $(WXDIR)/demos
 UTILSDIR = $(WXDIR)/utils
 MISCDIR  = $(WXDIR)/misc
 
@@ -341,6 +342,7 @@ DOCDIR = $(WXDIR)/docs
 
 WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
 WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
+WXDEMOS = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
 DISTDIR = ./_dist_dir/wx$(TOOLKIT)
 
 ############################## Files ##################################
@@ -876,18 +878,51 @@ MSW_DIST:
 	mkdir $(DISTDIR)/src/msw/ole
 	cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
 
+DEMOS_DIST:
+	mkdir $(DISTDIR)/demos
+	cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos
+
+	mkdir $(DISTDIR)/demos/bombs
+	cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs
+	cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs
+	cp $(DEMODIR)/bombs/*.cpp $(DISTDIR)/demos/bombs
+	cp $(DEMODIR)/bombs/*.h $(DISTDIR)/demos/bombs
+	cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
+	cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
+	
+	mkdir $(DISTDIR)/demos/forty
+	cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
+	cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty
+	cp $(DEMODIR)/forty/*.h $(DISTDIR)/demos/forty
+	cp $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty
+	cp $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty
+	cp $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty
+	
+	mkdir $(DISTDIR)/demos/life
+	mkdir $(DISTDIR)/demos/life/bitmaps
+	cp $(DEMODIR)/life/Makefile.in $(DISTDIR)/demos/life
+	cp $(DEMODIR)/life/makefile.unx $(DISTDIR)/demos/life
+	cp $(DEMODIR)/life/*.cpp $(DISTDIR)/demos/life
+	cp $(DEMODIR)/life/*.h $(DISTDIR)/demos/life
+	cp $(DEMODIR)/life/*.xpm $(DISTDIR)/demos/life
+	cp $(DEMODIR)/life/bitmaps/*.xpm $(DISTDIR)/demos/life/bitmaps
+	
+	mkdir $(DISTDIR)/demos/poem
+	cp $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem
+	cp $(DEMODIR)/poem/*.cpp $(DISTDIR)/demos/poem
+	cp $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem
+	cp $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem
+	cp $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem
+    
+	mkdir $(DISTDIR)/demos/fractal
+	cp $(DEMODIR)/fractal/Makefile.in $(DISTDIR)/demos/fractal
+	cp $(DEMODIR)/fractal/makefile.unx $(DISTDIR)/demos/fractal
+	cp $(DEMODIR)/fractal/*.cpp $(DISTDIR)/demos/fractal
+	
 SAMPLES_DIST:
 	mkdir $(DISTDIR)/samples
 	cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
 	
-	mkdir $(DISTDIR)/samples/bombs
-	cp $(SAMPDIR)/bombs/Makefile.in $(DISTDIR)/samples/bombs
-	cp $(SAMPDIR)/bombs/makefile.unx $(DISTDIR)/samples/bombs
-	cp $(SAMPDIR)/bombs/*.cpp $(DISTDIR)/samples/bombs
-	cp $(SAMPDIR)/bombs/*.h $(DISTDIR)/samples/bombs
-	cp $(SAMPDIR)/bombs/*.xpm $(DISTDIR)/samples/bombs
-	cp $(SAMPDIR)/bombs/readme.txt $(DISTDIR)/samples/bombs
-	
 	mkdir $(DISTDIR)/samples/caret
 	cp $(SAMPDIR)/caret/Makefile.in $(DISTDIR)/samples/caret
 	cp $(SAMPDIR)/caret/makefile.unx $(DISTDIR)/samples/caret
@@ -971,24 +1006,11 @@ SAMPLES_DIST:
 	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/makefile.unx $(DISTDIR)/samples/forty
-	cp $(SAMPDIR)/forty/*.h $(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/font
 	cp $(SAMPDIR)/font/Makefile.in $(DISTDIR)/samples/font
 	cp $(SAMPDIR)/font/makefile.unx $(DISTDIR)/samples/font
 	cp $(SAMPDIR)/font/*.cpp $(DISTDIR)/samples/font
 	
-	mkdir $(DISTDIR)/samples/fractal
-	cp $(SAMPDIR)/fractal/Makefile.in $(DISTDIR)/samples/fractal
-	cp $(SAMPDIR)/fractal/makefile.unx $(DISTDIR)/samples/fractal
-	cp $(SAMPDIR)/fractal/*.cpp $(DISTDIR)/samples/fractal
-	
 	mkdir $(DISTDIR)/samples/grid
 	cp $(SAMPDIR)/grid/Makefile.in $(DISTDIR)/samples/grid
 	cp $(SAMPDIR)/grid/makefile.unx $(DISTDIR)/samples/grid
@@ -1071,14 +1093,6 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout
 	cp $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout
 	
-	mkdir $(DISTDIR)/samples/life
-	mkdir $(DISTDIR)/samples/life/bitmaps
-	cp $(SAMPDIR)/life/Makefile.in $(DISTDIR)/samples/life
-	cp $(SAMPDIR)/life/makefile.unx $(DISTDIR)/samples/life
-	cp $(SAMPDIR)/life/*.cpp $(DISTDIR)/samples/life
-	cp $(SAMPDIR)/life/*.xpm $(DISTDIR)/samples/life
-	cp $(SAMPDIR)/life/bitmaps/*.xpm $(DISTDIR)/samples/life/bitmaps
-	
 	mkdir $(DISTDIR)/samples/listctrl
 	mkdir $(DISTDIR)/samples/listctrl/bitmaps
 	cp $(SAMPDIR)/listctrl/Makefile.in $(DISTDIR)/samples/listctrl
@@ -1123,10 +1137,10 @@ SAMPLES_DIST:
 	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/makefile.unx $(DISTDIR)/samples/nettest
-	cp $(SAMPDIR)/nettest/*.cpp $(DISTDIR)/samples/nettest
+	mkdir $(DISTDIR)/samples/dialup
+	cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup
+	cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup
+	cp $(SAMPDIR)/dialup/*.cpp $(DISTDIR)/samples/dialup
 	
 	mkdir $(DISTDIR)/samples/newgrid
 	cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid
@@ -1241,17 +1255,10 @@ SAMPLES_DIST:
 	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
+	mkdir $(DISTDIR)/samples/sockets
+	cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets
+	cp $(SAMPDIR)/sockets/*.cpp $(DISTDIR)/samples/sockets
+	cp $(SAMPDIR)/sockets/*.xpm $(DISTDIR)/samples/sockets
 
 UTILS_DIST:
 	mkdir $(DISTDIR)/utils
@@ -1290,10 +1297,12 @@ MISC_DIST:
 	mkdir $(DISTDIR)/misc/gs_afm
 	cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm
 	
-dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST
+dist: ALL_DIST @GUIDIST@ SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST
 	cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
 	mv _dist_dir/wx$(TOOLKIT)/samples _dist_dir/wx$(TOOLKIT)/wxSamples
 	cd _dist_dir/wx$(TOOLKIT); tar ch wxSamples | gzip -f9 > $(WXSAMPLES); mv $(WXSAMPLES) ../..
+	mv _dist_dir/wx$(TOOLKIT)/demos _dist_dir/wx$(TOOLKIT)/wxDemos
+	cd _dist_dir/wx$(TOOLKIT); tar ch wxDemos | gzip -f9 > $(WXDEMOS); mv $(WXDEMOS) ../..
 	$(RM) -r _dist_dir
 
 clean: