X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca58c9bbb812c7501d034afaf91dc0e865142768..dbe931ab5e8129e8de3d12ccdb2a207ed235cad6:/build/bakefiles/make_dist.mk

diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index 30e1922d5f..56468d7da1 100644
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -1,6 +1,5 @@
 #
 # "make dist" target implementation:
-# $Id$
 #
 
 
@@ -20,6 +19,7 @@ JPEGDIR  = $(WXDIR)/src/jpeg
 TIFFDIR  = $(WXDIR)/src/tiff
 ZLIBDIR  = $(WXDIR)/src/zlib
 REGEXDIR = $(WXDIR)/src/regex
+EXPATDIR = $(WXDIR)/src/expat
 GTKDIR   = $(WXDIR)/src/gtk
 X11DIR   = $(WXDIR)/src/x11
 X11INC   = $(WXDIR)/include/wx/x11
@@ -110,6 +110,16 @@ ALL_DIST: distrib_clean
 	cp $(REGEXDIR)/WHATSNEW $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/mkh $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/tests $(DISTDIR)/src/regex
+	cp -Rf $(EXPATDIR) $(DISTDIR)/src
+	(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`)
+	mkdir $(DISTDIR)/src/iodbc
+	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
 	# copy some files from include/ that are not installed:
 	mkdir $(DISTDIR)/include
 	mkdir $(DISTDIR)/include/wx
@@ -174,14 +184,6 @@ ALL_GUI_DIST: ALL_DIST
 	cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff
 	cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff
 	cp $(TIFFDIR)/README $(DISTDIR)/src/tiff
-	mkdir $(DISTDIR)/src/iodbc
-	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
 
 BASE_DIST: ALL_DIST
 	# make --disable-gui the default
@@ -255,6 +257,8 @@ MOTIF_DIST: ALL_GUI_DIST
 	cp $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
 		$(X11INC)/bitmap.h $(X11INC)/private.h $(X11INC)/region.h \
 		$(DISTDIR)/include/wx/x11
+	mkdir $(DISTDIR)/contrib
+	cp -R $(WXDIR)/contrib $(DISTDIR)
 
 MACX_DIST: ALL_GUI_DIST
 	cp $(INCDIR)/*.* $(DISTDIR)/include
@@ -268,6 +272,8 @@ MACX_DIST: ALL_GUI_DIST
 	cp $(MACDIR)/morefile/*.c $(DISTDIR)/src/mac/morefile
 	mkdir $(DISTDIR)/src/mac/macsock
 	cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock
+	mkdir $(DISTDIR)/contrib
+	cp -R $(WXDIR)/contrib $(DISTDIR)
 
 # TODO: Distribute some files
 COCOA_DIST: ALL_GUI_DIST
@@ -460,6 +466,11 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/*.mms $(DISTDIR)/samples/dialogs
 
+	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/dnd
 	cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd
 	cp $(SAMPDIR)/dnd/makefile.unx $(DISTDIR)/samples/dnd
@@ -537,6 +548,12 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/help/*.xpm $(DISTDIR)/samples/help
 	cp $(SAMPDIR)/help/doc/*.* $(DISTDIR)/samples/help/doc
 
+	mkdir $(DISTDIR)/samples/htlbox
+	cp $(SAMPDIR)/htlbox/Makefile.in $(DISTDIR)/samples/htlbox
+	cp $(SAMPDIR)/htlbox/makefile.unx $(DISTDIR)/samples/htlbox
+	cp $(SAMPDIR)/htlbox/*.cpp $(DISTDIR)/samples/htlbox
+	cp $(SAMPDIR)/htlbox/*.xpm $(DISTDIR)/samples/htlbox
+
 	mkdir $(DISTDIR)/samples/html
 	cp $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html
 	mkdir $(DISTDIR)/samples/html/about
@@ -690,10 +707,10 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/mobile/styles/*.h $(DISTDIR)/samples/mobile/styles
 	cp $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles
     
-	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/multimon
+	cp $(SAMPDIR)/multimon/Makefile.in $(DISTDIR)/samples/multimon
+	cp $(SAMPDIR)/multimon/makefile.unx $(DISTDIR)/samples/multimon
+	cp $(SAMPDIR)/multimon/*.cpp $(DISTDIR)/samples/multimon
 
 	mkdir $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
@@ -744,6 +761,11 @@ SAMPLES_DIST: ALL_GUI_DIST
 #	cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource
 #	cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource
 
+	mkdir $(DISTDIR)/samples/render
+	cp $(SAMPDIR)/render/Makefile.in $(DISTDIR)/samples/render
+	cp $(SAMPDIR)/render/makefile.unx $(DISTDIR)/samples/render
+	cp $(SAMPDIR)/render/*.cpp $(DISTDIR)/samples/render
+
 	mkdir $(DISTDIR)/samples/rotate
 	cp $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate
 	cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate
@@ -894,12 +916,6 @@ UTILS_DIST: ALL_GUI_DIST
 	cp $(UTILSDIR)/emulator/docs/*.txt $(DISTDIR)/utils/emulator/docs
 	cp $(UTILSDIR)/emulator/docs/*.jpg $(DISTDIR)/utils/emulator/docs
 
-	mkdir $(DISTDIR)/utils/makegen
-	mkdir $(DISTDIR)/utils/makegen/templates
-	cp $(UTILSDIR)/makegen/Makefile.in $(DISTDIR)/utils/makegen
-	cp $(UTILSDIR)/makegen/*.cpp $(DISTDIR)/utils/makegen
-	cp $(UTILSDIR)/makegen/templates/*.* $(DISTDIR)/utils/makegen/templates
-
 	mkdir $(DISTDIR)/utils/hhp2cached
 	cp $(UTILSDIR)/hhp2cached/*.* $(DISTDIR)/utils/hhp2cached