X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1293dcf96057ed7f7c5ada816377eaf19532c1e..7e6f48d18c6173e0655120e50b66dace36f2d1c6:/build/bakefiles/make_dist.mk

diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index 746b8cbefe..6ae6bf880a 100644
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -67,6 +67,9 @@ DISTDIR=./_dist_dir/$(DISTDIRNAME)
 ALL_DIST: distrib_clean
 	mkdir _dist_dir
 	mkdir $(DISTDIR)
+	cp $(WXDIR)/configure.in $(DISTDIR)
+	cp $(WXDIR)/configure $(DISTDIR)
+	cp $(WXDIR)/autoconf_inc.m4 $(DISTDIR)
 	cp $(WXDIR)/wxwin.m4 $(DISTDIR)
 	cp $(WXDIR)/aclocal.m4 $(DISTDIR)
 	cp $(WXDIR)/config.sub $(DISTDIR)
@@ -101,15 +104,9 @@ ALL_DIST: distrib_clean
 	cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
 	mkdir $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/*.h $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/*.ih $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/Makefile $(DISTDIR)/src/regex
-	cp $(REGEXDIR)/makefile.* $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
 	cp $(REGEXDIR)/README $(DISTDIR)/src/regex
-	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
@@ -128,8 +125,6 @@ ALL_DIST: distrib_clean
 # this target is the common part of distribution script for all GUI toolkits,
 # but is not used when building wxBase distribution
 ALL_GUI_DIST: ALL_DIST
-	cp $(WXDIR)/configure.in $(DISTDIR)
-	cp $(WXDIR)/configure $(DISTDIR)
 	cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
 	cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
 	if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \
@@ -959,65 +954,26 @@ MANUAL_DIST:
 	cp $(DOCDIR)/latex/wx/*.bib $(DISTDIR)/docs/latex/wx
 	cp $(DOCDIR)/latex/wx/*.sty $(DISTDIR)/docs/latex/wx
 
-# this target does not generate a complete wxPython dist, it only includes
-# those files needed for the Debian source package.
-# see utils/wxPython/distrib for scripts to make a proper wxPython dist.
+
+# Copy all the files from wxPython needed for the Debian source package, 
+# and then remove some that are not needed.
 PYTHON_DIST:
-	mkdir $(DISTDIR)/wxPython
-	mkdir $(DISTDIR)/wxPython/contrib
-	mkdir $(DISTDIR)/wxPython/contrib/dllwidget
-	mkdir $(DISTDIR)/wxPython/contrib/gizmos
-	mkdir $(DISTDIR)/wxPython/contrib/gizmos/gtk
-	mkdir $(DISTDIR)/wxPython/contrib/glcanvas
-	mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk
-	mkdir $(DISTDIR)/wxPython/contrib/ogl
-	mkdir $(DISTDIR)/wxPython/contrib/ogl/gtk
-	mkdir $(DISTDIR)/wxPython/contrib/stc
-	mkdir $(DISTDIR)/wxPython/contrib/stc/gtk
-	mkdir $(DISTDIR)/wxPython/contrib/xrc
-	mkdir $(DISTDIR)/wxPython/demo
-	mkdir $(DISTDIR)/wxPython/demo/bitmaps
-	mkdir $(DISTDIR)/wxPython/demo/bmp_source
-	mkdir $(DISTDIR)/wxPython/demo/data
-	mkdir $(DISTDIR)/wxPython/demo/dllwidget
-	mkdir $(DISTDIR)/wxPython/docs
-	mkdir $(DISTDIR)/wxPython/src
-	mkdir $(DISTDIR)/wxPython/src/gtk
-	mkdir $(DISTDIR)/wxPython/scripts
-	mkdir $(DISTDIR)/wxPython/wxPython
-	mkdir $(DISTDIR)/wxPython/wxPython/lib
-	mkdir $(DISTDIR)/wxPython/wxPython/lib/colourchooser
-	mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
-	mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
-	mkdir $(DISTDIR)/wxPython/wxPython/tools
-	mkdir $(DISTDIR)/wxPython/wxPython/tools/XRCed
-
-	cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
-	cp $(WXDIR)/wxPython/contrib/dllwidget/*.{py,cpp,h,i} $(DISTDIR)/wxPython/contrib/dllwidget
-	cp $(WXDIR)/wxPython/contrib/gizmos/*.{cpp,h,i,txt} $(DISTDIR)/wxPython/contrib/gizmos
-	cp $(WXDIR)/wxPython/contrib/gizmos/gtk/*.{py,cpp} $(DISTDIR)/wxPython/contrib/gizmos/gtk
-	-cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas
-	cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk
-	-cp $(WXDIR)/wxPython/contrib/ogl/*.{i,txt,h} $(DISTDIR)/wxPython/contrib/ogl
-	-cp $(WXDIR)/wxPython/contrib/ogl/gtk/*.{py,cpp} $(DISTDIR)/wxPython/contrib/ogl/gtk
-	-cp $(WXDIR)/wxPython/contrib/stc/* $(DISTDIR)/wxPython/contrib/stc
-	-cp $(WXDIR)/wxPython/contrib/stc/gtk/* $(DISTDIR)/wxPython/contrib/stc/gtk
-	-cp $(WXDIR)/wxPython/contrib/xrc/xrc.* $(DISTDIR)/wxPython/contrib/xrc
-	-cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo
-	-cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps
-	-cp $(WXDIR)/wxPython/demo/bmp_source/* $(DISTDIR)/wxPython/demo/bmp_source
-	-cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data
-	-cp $(WXDIR)/wxPython/demo/dllwidget/Makefile $(DISTDIR)/wxPython/demo/dllwidget
-	-cp $(WXDIR)/wxPython/demo/dllwidget/test_* $(DISTDIR)/wxPython/demo/dllwidget
-	-cp $(WXDIR)/wxPython/scripts/* $(DISTDIR)/wxPython/scripts
-	-cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src
-	cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk
-	cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk
-	cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib
-	cp $(WXDIR)/wxPython/wxPython/lib/colourchooser/*.py $(DISTDIR)/wxPython/wxPython/lib/colourchooser
-	cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
-	cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins
-	cp $(WXDIR)/wxPython/wxPython/tools/*.py $(DISTDIR)/wxPython/wxPython/tools
+	for dir in `grep -v '#' $(WXDIR)/wxPython/distrib/DIRLIST`; do \
+		echo "Copying dir: $$dir..."; \
+		mkdir $(DISTDIR)/$$dir; \
+		cp $(WXDIR)/$$dir/* $(DISTDIR)/$$dir > /dev/null 2>&1; \
+	done; \
+	\
+	find $(DISTDIR)/wxPython -name "*~"           > RM_FILES; \
+	find $(DISTDIR)/wxPython -name "*.pyc"       >> RM_FILES; \
+	find $(DISTDIR)/wxPython -name "*.bat"       >> RM_FILES; \
+	find $(DISTDIR)/wxPython -name "core"        >> RM_FILES; \
+	find $(DISTDIR)/wxPython -name "core.[0-9]*" >> RM_FILES; \
+	find $(DISTDIR)/wxPython -name "*.orig"      >> RM_FILES; \
+	find $(DISTDIR)/wxPython -name "*.rej"       >> RM_FILES; \
+	for f in `cat RM_FILES`; do rm $$f; done; \
+	rm RM_FILES
+
 
 distrib_clean:
 	$(RM) -r _dist_dir
@@ -1111,9 +1067,22 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 	@# in other dist targets.  Ugly and hardly portable but it
 	@# will run on any Debian box and that's enough for now.
 
-	find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \
-			\( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
-			-print0 | xargs -0 rm -rf
+	rm -rf $(DISTDIR)/contrib/build
+	find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp"    \
+			   -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms"    \
+			   -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r"    \
+			   -o -name "*.bkl" -o -name "*.pro" -o -name "*.def"    \
+			   -o -name "*.vpj" -o -name "*.sc"                      \
+			   -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \
+			\) -print0 | xargs -0 rm -rf
+
+	rm -rf $(DISTDIR)/wxPython/SWIG
+	rm -rf $(DISTDIR)/wxPython/distrib
+	rm -rf $(DISTDIR)/wxPython/distutils
+	rm -rf $(DISTDIR)/wxPython/samples
+	rm -rf $(DISTDIR)/wxPython/contrib/iewin
+	find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf
+
 
 	@# We can't get at the individual components of the version here
 	@# anymore, so strip the major and minor version out of the blob.