]> git.saurik.com Git - wxWidgets.git/blobdiff - distrib/msw/tmake/unx.t
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
More life in wxPlot.
[wxWidgets.git] / distrib / msw / tmake / unx.t
diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t
index 4533c15d2a3f58435826abe0cf27e7ebcd4d9b05..38a6514efb2a900d8b1184b1d2c7393d31eacc43 100644 (file)
--- a/distrib/msw/tmake/unx.t
+++ b/distrib/msw/tmake/unx.t
@@ -256,7 +256,10 @@ VP9 = @top_srcdir@/src/tiff
 VP10 = @top_srcdir@/src/zlib
 VP11 = @top_srcdir@/src/iodbc
 
-VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)
+# the comment at the end of the next line is needed because otherwise autoconf
+# would remove this line completely - it contains a built-in hack to remove
+# any VPATH assignment not containing ':'
+VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf
 
 top_srcdir = @top_srcdir@
 prefix = @prefix@
@@ -305,6 +308,8 @@ host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
 
+USE_GUI=@USE_GUI@
+
 ############################# Dirs #################################
 
 WXDIR = $(top_srcdir)
@@ -327,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
 
@@ -336,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 ##################################
@@ -675,6 +682,14 @@ lexer.c:   $(COMMDIR)/lexer.l
 
 -include $(DEPFILES)
 
+afminstall:
+       $(INSTALL) -d $(datadir)
+       $(INSTALL) -d $(datadir)/wx
+       $(INSTALL) -d $(datadir)/wx/afm
+       $(INSTALL) -d $(datadir)/wx/gs_afm
+       $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
+       $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
+       
 preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
        @echo " "
        @echo " Installing wxWindows..."
@@ -683,7 +698,6 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
        $(INSTALL) -d $(prefix)
        $(INSTALL) -d $(bindir)
        $(INSTALL) -d $(libdir)
-       $(INSTALL) -d $(datadir)
 
        $(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
        $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
@@ -694,25 +708,17 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
        $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
        $(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
        
-       $(INSTALL) -d $(datadir)/wx
-       $(INSTALL) -d $(datadir)/wx/afm
-       $(INSTALL) -d $(datadir)/wx/gs_afm
-       $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
-       $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
-       
        $(INSTALL) -d $(includedir)/wx
-       $(INSTALL) -d $(includedir)/wx/msw
-       $(INSTALL) -d $(includedir)/wx/gtk
-       $(INSTALL) -d $(includedir)/wx/motif
-       $(INSTALL) -d $(includedir)/wx/html
-       $(INSTALL) -d $(includedir)/wx/protocol
-       $(INSTALL) -d $(includedir)/wx/unix
-       $(INSTALL) -d $(includedir)/wx/generic
+       @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
+       @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
+       @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/protocol; fi
+       @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/unix; fi
+       @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
        @list='$(HEADERS)'; for p in $$list; do \
          $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
          echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
        done
-       
+
 write_message:
        @echo " "
        @echo " The installation of wxWindows is finished.  On certain"
@@ -725,7 +731,7 @@ write_message:
        @echo " Read the wxWindows Licence on licencing conditions."
        @echo " "
 
-install: preinstall @WX_ALL_INSTALLED@ write_message
+install: preinstall @AFMINSTALL@ @WX_ALL_INSTALLED@ write_message
 
 uninstall:
        @echo " "
@@ -872,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
@@ -967,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
@@ -1067,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
@@ -1119,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
@@ -1237,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
@@ -1286,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:
wxWidgets (Impactor)