X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/07eb77a690c51d4d8310402a0275a16a0a99e755..9ef63a4a59eccce6cd8787f0ed966bfa8365a22e:/debian/rules

diff --git a/debian/rules b/debian/rules
index 17d49a9165..bc44d142a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,42 +3,113 @@
 #
 # Sculpted 13/2/2000 by Ron Lee <ron@debian.org> from new and
 # variously stolen code :-)
-# (including a debhelper template, GNU copyright 1997 to 1999 by
-# Joey Hess, and some ideas found in the ncurses rules file that
-# I quite liked.  Thanks!)
+# It makes copious use of the debhelper utilities written by
+# Joey Hess and others.
 
 #export DH_VERBOSE=1
 export DH_COMPAT=2
+export DH_OPTIONS
 
 release:=$(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p')
+python_dir:=python$(shell python -c "import sys;print sys.version[:3]")
+
+cross_host=i586-mingw32msvc
+cross_build=$(shell ./config.guess)
+
+config_cache=../config_deb.cache
+config_cache_cross=../config_deb_cross.cache
 
 # Packages to build:
 package_wxbase_lib=libwxbase$(release)
 package_wxbase_dev=libwxbase$(release)-dev
+package_wxbase_dbg=libwxbase$(release)-dbg
 package_gtk_lib=libwxgtk$(release)
 package_gtk_dev=libwxgtk$(release)-dev
+package_gtk_dbg=libwxgtk$(release)-dbg
 package_gtk_py=libwxgtk$(release)-python
+package_gtk_contrib=libwxgtk$(release)-contrib
+package_gtk_contrib_dev=libwxgtk$(release)-contrib-dev
+package_headers=wxwin$(release)-headers
+package_i18n=wxwin$(release)-i18n
 package_doc=wxwin$(release)-doc
 package_examples=wxwin$(release)-examples
 
+package_gtk_univ=libwxgtk$(release)-univ
+
+package_wxbase_msw_dev=libwxbase-msw$(release)-dev
+package_wxbase_msw_dbg=libwxbase-msw$(release)-dbg
+package_msw_dev=libwxmsw$(release)-dev
+package_msw_dbg=libwxmsw$(release)-dbg
+package_headers_msw=wxwin$(release)-headers-msw
+
 # Build directories:
 objdir_wxbase_shared=objs_wxbase_sh
 objdir_wxbase_static=objs_wxbase_st
+objdir_wxbase_debug=objs_wxbase_d
 objdir_gtk_shared=objs_gtk_sh
 objdir_gtk_static=objs_gtk_st
+objdir_gtk_debug=objs_gtk_d
 objdir_doc_cruft=objs_doc_con
 objdir_doc=docs/wxWindows-manual.html
 objdir_examples=docs/examples
-objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_gtk_shared) \
-	$(objdir_gtk_static) $(objdir_doc) $(objdir_examples)
+objdir_i18n=locale
+
+objdir_gtk_univ=objs_gtk_univ
+
+objdir_wxbase_msw_shared=objs_wxbase_msw_sh
+objdir_wxbase_msw_static=objs_wxbase_msw_st
+objdir_wxbase_msw_dbg=objs_wxbase_msw_d
+objdir_msw_shared=objs_msw_sh
+objdir_msw_static=objs_msw_st
+objdir_msw_dbg=objs_msw_d
+
+objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
+	$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) $(objdir_gtk_univ) \
+	$(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \
+	$(objdir_wxbase_msw_shared) $(objdir_wxbase_msw_static) $(objdir_wxbase_msw_dbg) \
+	$(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg)
+
+#	note that the i18n package is actually arch indep (once built)
+#	but must be built (and installed) during the arch any phase as
+#	it's pulled out of the wxGtk shared lib package.
+
+# Build stamps:
+build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
+                  build-wxbase-debug-stamp build-gtk-shared-stamp \
+                  build-gtk-static-stamp build-gtk-debug-stamp \
+                  build-gtk-univ-stamp \
+                  build-contrib-shared-stamp build-contrib-static-stamp \
+                  build-gtk-py-stamp build-i18n-stamp
+
+build_indep_stamps=build-examples-stamp build-doc-stamp
+
+build_cross_stamps=build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp \
+		   build-wxbase-msw-dbg-stamp build-msw-shared-stamp \
+		   build-msw-static-stamp build-msw-dbg-stamp
+
+build_stamps_native=$(build_arch_stamps) $(build_indep_stamps)
+
+build_stamps=$(build_stamps_native) $(build_cross_stamps)
+
+# Install targets:
+install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
+                 install-gtk-lib install-gtk-dev install-gtk-dbg \
+                 install-gtk-univ \
+                 install-gtk-contrib install-gtk-contrib-dev install-gtk-py \
+                 install-headers install-i18n
+
+install_all_indep=install-examples install-doc
+
+install_all_cross=install-wxbase-msw-dev install-wxbase-msw-dbg install-msw-dev install-msw-dbg install-headers-msw
+
+install_all_native=$(install_all_arch) $(install_all_indep)
+
+install_all=$(install_all_native) $(install_all_cross)
 
-build_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
-             build-gtk-shared-stamp build-gtk-static-stamp \
-             build-gtk-python-stamp build-examples-stamp build-doc-stamp
 
 wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
-		--prefix=$(shell pwd) \
-		--exec-prefix=$(shell pwd)/$(objdir_gtk_shared)
+                --prefix=$(shell pwd) \
+                --exec-prefix=$(shell pwd)/$(objdir_gtk_shared)
 
 
 # The Rules:
@@ -46,52 +117,230 @@ wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
 debian/control: debian/control.in
 	sed -e 's/=V/$(release)/g' < debian/control.in > debian/control
 
-debian/wxwin-doc.doc-base: debian/wxwin-doc.doc-base.in
-	sed -e 's/=V/$(release)/g' < debian/wxwin-doc.doc-base.in > debian/wxwin-doc.doc-base
+control-files-stamp: debian/control
+	dh_testdir
+	@for f in dirs postinst; do \
+		echo "generating control file $(package_wxbase_lib).$$f"; \
+		cp debian/libwxbase.$$f debian/$(package_wxbase_lib).$$f; \
+	done;
+	@for f in dirs files links postinst prerm; do \
+		echo "generating control file $(package_wxbase_dev).$$f"; \
+		sed -e 's/=V/$(release)/g' < debian/libwxbase-dev.$$f \
+			> debian/$(package_wxbase_dev).$$f; \
+	done;
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_wxbase_dbg).$$f"; \
+		sed -e 's/=V/$(release)/g' < debian/libwxbase-dbg.$$f \
+			> debian/$(package_wxbase_dbg).$$f; \
+	done;
+	@for f in dirs postinst; do \
+		echo "generating control file $(package_gtk_lib).$$f"; \
+		cp debian/libwxgtk.$$f debian/$(package_gtk_lib).$$f; \
+	done;
+	@for f in dirs files links postinst prerm; do \
+		echo "generating control file $(package_gtk_dev).$$f"; \
+		sed -e 's/=V/$(release)/g' < debian/libwxgtk-dev.$$f \
+			> debian/$(package_gtk_dev).$$f; \
+	done;
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_gtk_dbg).$$f"; \
+		sed -e 's/=V/$(release)/g' < debian/libwxgtk-dbg.$$f \
+			> debian/$(package_gtk_dbg).$$f; \
+	done;
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_gtk_univ).$$f"; \
+		sed -e 's/=V/$(release)/g' < debian/libwxgtk-univ.$$f \
+			> debian/$(package_gtk_univ).$$f; \
+	done;
+	@for f in dirs docs files postinst prerm; do \
+		echo "generating control file $(package_gtk_py).$$f"; \
+		sed -e 's/=PY/$(python_dir)/g;s/=V/$(release)/g' < debian/libwxgtk-python.$$f \
+			> debian/$(package_gtk_py).$$f; \
+	done;
+	@for f in dirs postinst; do \
+		echo "generating control file $(package_gtk_contrib).$$f"; \
+		cp debian/libwxgtk-contrib.$$f debian/$(package_gtk_contrib).$$f; \
+	done;
+	@for f in dirs files; do \
+		echo "generating control file $(package_gtk_contrib_dev).$$f"; \
+		cp debian/libwxgtk-contrib-dev.$$f debian/$(package_gtk_contrib_dev).$$f; \
+	done;
+	@for f in dirs files; do \
+		echo "generating control file $(package_headers).$$f"; \
+		cp debian/wxwin-headers.$$f debian/$(package_headers).$$f; \
+	done;
+	@for f in dirs files; do \
+		echo "generating control file $(package_i18n).$$f"; \
+		cp debian/wxwin-i18n.$$f debian/$(package_i18n).$$f; \
+	done;
+	@for f in dirs docs doc-base; do \
+		echo "generating control file $(package_doc).$$f"; \
+		sed -e 's/=V/$(release)/g' < debian/wxwin-doc.$$f \
+			> debian/$(package_doc).$$f; \
+	done;
+	@for f in examples; do \
+		echo "generating control file $(package_examples).$$f"; \
+		cp debian/wxwin-examples.$$f debian/$(package_examples).$$f; \
+	done;
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_wxbase_msw_dev).$$f"; \
+		sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxbase-msw-dev.$$f \
+			> debian/$(package_wxbase_msw_dev).$$f; \
+	done;
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_wxbase_msw_dbg).$$f"; \
+		sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxbase-msw-dbg.$$f \
+			> debian/$(package_wxbase_msw_dbg).$$f; \
+	done;
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_msw_dev).$$f"; \
+		sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxmsw-dev.$$f \
+			> debian/$(package_msw_dev).$$f; \
+	done;
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_msw_dbg).$$f"; \
+		sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxmsw-dbg.$$f \
+			> debian/$(package_msw_dbg).$$f; \
+	done;
+	@for f in dirs; do \
+		echo "generating control file $(package_headers_msw).$$f"; \
+		sed -e 's/=H/$(cross_host)/g' < debian/wxwin-headers-msw.$$f \
+			> debian/$(package_headers_msw).$$f; \
+	done;
+	touch $@
+
+build_arch: control-files-stamp $(build_arch_stamps)
+build_all: control-files-stamp $(build_stamps_native)
+
+# Really we should probably do nothing here until we know which
+# binary target is being called, but alpha builds were exploding
+# (compiler segfaults) in random places when building under fakeroot
+# from the binary-arch target.  Build all -arch files here then, and
+# let the -indep stuff fend for itself later.
+
+build: build_arch
 
-build: debian/control debian/wxwin-doc.doc-base $(build_stamps)
 
 build-wxbase-shared-stamp:
 	dh_testdir
-	mkdir $(objdir_wxbase_shared)
+	mkdir -p $(objdir_wxbase_shared)
 	cd $(objdir_wxbase_shared) \
-		&& ../configure --prefix=/usr --disable-gui --enable-burnt_name \
+		&& ../configure --prefix=/usr \
+				--cache-file=$(config_cache) \
+				--disable-gui \
+				--enable-soname \
+				--with-zlib=sys \
 		&& $(MAKE)
 	touch $@
 
 build-wxbase-static-stamp:
 	dh_testdir
-	mkdir $(objdir_wxbase_static)
+	mkdir -p $(objdir_wxbase_static)
 	cd $(objdir_wxbase_static) \
-		&& ../configure --prefix=/usr --disable-gui --disable-shared \
+		&& ../configure --prefix=/usr \
+				--cache-file=$(config_cache) \
+				--disable-gui \
+				--disable-shared \
+				--with-zlib=sys \
+		&& $(MAKE)
+	touch $@
+
+build-wxbase-debug-stamp:
+	dh_testdir
+	mkdir -p $(objdir_wxbase_debug)
+	cd $(objdir_wxbase_debug) \
+		&& ../configure --prefix=/usr \
+				--cache-file=$(config_cache) \
+				--disable-gui \
+				--enable-debug \
+				--enable-soname \
+				--with-zlib=sys \
 		&& $(MAKE)
 	touch $@
 
 build-gtk-shared-stamp:
 	dh_testdir
-	mkdir $(objdir_gtk_shared)
+	mkdir -p $(objdir_gtk_shared)
 	cd $(objdir_gtk_shared) \
-		&& ../configure --prefix=/usr --with-gtk --enable-burnt_name --disable-newgrid \
+		&& ../configure --prefix=/usr \
+				--cache-file=$(config_cache) \
+				--with-gtk \
+				--with-opengl \
+				--enable-soname \
+				--with-zlib=sys \
+				--with-libjpeg=sys \
+				--with-libpng=sys \
+				--with-libtiff=sys \
 		&& $(MAKE)
 	touch $@
 
 build-gtk-static-stamp:
 	dh_testdir
-	mkdir $(objdir_gtk_static)
+	mkdir -p $(objdir_gtk_static)
 	cd $(objdir_gtk_static) \
-		&& ../configure --prefix=/usr --with-gtk --disable-shared \
+		&& ../configure --prefix=/usr \
+				--cache-file=$(config_cache) \
+				--with-gtk \
+				--with-opengl \
+				--disable-shared \
+				--with-zlib=sys \
+				--with-libjpeg=sys \
+				--with-libpng=sys \
+				--with-libtiff=sys \
+		&& $(MAKE)
+	touch $@
+
+build-gtk-debug-stamp:
+	dh_testdir
+	mkdir -p $(objdir_gtk_debug)
+	cd $(objdir_gtk_debug) \
+		&& ../configure --prefix=/usr \
+				--cache-file=$(config_cache) \
+				--with-gtk \
+				--with-opengl \
+				--enable-debug \
+				--enable-soname \
+				--with-zlib=sys \
+				--with-libjpeg=sys \
+				--with-libpng=sys \
+				--with-libtiff=sys \
+		&& $(MAKE)
+	touch $@
+
+build-gtk-univ-stamp:
+	dh_testdir
+	mkdir -p $(objdir_gtk_univ)
+	cd $(objdir_gtk_univ) \
+		&& ../configure --prefix=/usr \
+				--cache-file=$(config_cache) \
+				--with-gtk \
+				--with-opengl \
+				--enable-universal \
+				--enable-soname \
+				--with-zlib=sys \
+				--with-libjpeg=sys \
+				--with-libpng=sys \
+				--with-libtiff=sys \
+		&& $(MAKE)
+	touch $@
+
+build-contrib-shared-stamp: build-gtk-shared-stamp
+	dh_testdir
+	cd $(objdir_gtk_shared)/contrib/src \
+		&& $(MAKE)
+	touch $@
+
+build-contrib-static-stamp: build-gtk-static-stamp
+	dh_testdir
+	cd $(objdir_gtk_static)/contrib/src \
 		&& $(MAKE)
 	touch $@
 
-build-gtk-python-stamp: build-gtk-shared-stamp
+build-gtk-py-stamp: build-gtk-shared-stamp
 	dh_testdir
-	cd utils/wxPython/src \
-		&& touch gtk/*.cpp gtk/*.py \
-		&& ../distrib/build.py -b WXDIR=../../.. WXCONFIG='$(wxconfig)'
-	cd utils/wxPython/modules/html \
-		&& ../../distrib/build.py -b WXDIR=../../../.. WXCONFIG='$(wxconfig)'
-	cd utils/wxPython/modules/utils \
-		&& ../../distrib/build.py -b WXDIR=../../../.. WXCONFIG='$(wxconfig)'
+	touch docs/lgpl.txt
+	cd wxPython \
+		&& ./setup.py build IN_CVS_TREE=1 WX_CONFIG='$(wxconfig)'
 	touch $@
 
 build-doc-stamp: build-gtk-shared-stamp
@@ -101,7 +350,7 @@ build-doc-stamp: build-gtk-shared-stamp
 	mkdir $(objdir_doc)
 	mkdir $(objdir_doc_cruft)
 	cd $(objdir_doc_cruft) \
-		&& LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib \
+		&& LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib:$(LD_LIBRARY_PATH) \
 		   ../$(objdir_gtk_shared)/utils/tex2rtf/src/tex2rtf \
 		   ../docs/latex/wx/manual.tex ../$(objdir_doc)/wxwin.htm -twice -html
 	cp docs/latex/wx/*.gif $(objdir_doc)
@@ -110,12 +359,17 @@ build-doc-stamp: build-gtk-shared-stamp
 	      $(objdir_doc)/wxwin.htx $(objdir_doc)/wxwin.ref
 	touch $@
 
-build-examples-stamp:
+build-examples-stamp: build-gtk-shared-stamp
 	dh_testdir
-	mkdir $(objdir_examples)
+	mkdir -p $(objdir_examples)
+
+	# copy all samples and the Makefile generated for libwxgtk.
 	cp -a samples $(objdir_examples)
+	rm -f $(objdir_examples)/samples/Makefile
+	cp -a $(objdir_gtk_shared)/samples/Makefile $(objdir_examples)/samples
+
 	cp -a demos $(objdir_examples)
-	cp -a utils/wxPython/demo $(objdir_examples)/wxPython
+	cp -a wxPython/demo $(objdir_examples)/wxPython
 	@for d in $(objdir_examples)/demos $(objdir_examples)/samples; do \
 		(cd $$d \
 			&& mv Makefile.in Makefile \
@@ -129,109 +383,434 @@ build-examples-stamp:
 	done;
 	touch $@
 
+build-i18n-stamp: build-gtk-shared-stamp
+	dh_testdir
+
+	# touch .po files first, since if they are not already up
+	# to date then _now_ is not the time to fix it.
+	# That should have been been done before cvs was tagged.
+	cd $(objdir_i18n) \
+		&& touch *.po \
+		&& $(MAKE) allmo
+	touch $@
+
+build-wxbase-msw-shared-stamp:
+	dh_testdir
+	mkdir -p $(objdir_wxbase_msw_shared)
+	cd $(objdir_wxbase_msw_shared) \
+		&& ../configure --prefix=/usr/$(cross_host) \
+				--cache-file=$(config_cache_cross) \
+				--host=$(cross_host) \
+				--build=$(cross_build) \
+				--disable-gui \
+		&& $(MAKE)
+	touch $@
+
+build-wxbase-msw-static-stamp:
+	dh_testdir
+	mkdir -p $(objdir_wxbase_msw_static)
+	cd $(objdir_wxbase_msw_static) \
+		&& ../configure --prefix=/usr/$(cross_host) \
+				--cache-file=$(config_cache_cross) \
+				--host=$(cross_host) \
+				--build=$(cross_build) \
+				--disable-gui \
+				--disable-shared \
+		&& $(MAKE)
+	touch $@
+
+# Note this builds dll only, since wxmsw static debug is > 130MB !
+build-wxbase-msw-dbg-stamp:
+	dh_testdir
+	mkdir -p $(objdir_wxbase_msw_dbg)
+	cd $(objdir_wxbase_msw_dbg) \
+		&& ../configure --prefix=/usr/$(cross_host) \
+				--cache-file=$(config_cache_cross) \
+				--host=$(cross_host) \
+				--build=$(cross_build) \
+				--disable-gui \
+				--enable-debug \
+		&& $(MAKE)
+	touch $@
+
+build-msw-shared-stamp:
+	dh_testdir
+	mkdir -p $(objdir_msw_shared)
+	cd $(objdir_msw_shared) \
+		&& ../configure --prefix=/usr/$(cross_host) \
+				--cache-file=$(config_cache_cross) \
+				--host=$(cross_host) \
+				--build=$(cross_build) \
+		&& $(MAKE)
+	touch $@
+
+build-msw-static-stamp:
+	dh_testdir
+	mkdir -p $(objdir_msw_static)
+	cd $(objdir_msw_static) \
+		&& ../configure --prefix=/usr/$(cross_host) \
+				--cache-file=$(config_cache_cross) \
+				--host=$(cross_host) \
+				--build=$(cross_build) \
+				--disable-shared \
+		&& $(MAKE)
+	touch $@
+
+build-msw-dbg-stamp:
+	dh_testdir
+	mkdir -p $(objdir_msw_dbg)
+	cd $(objdir_msw_dbg) \
+		&& ../configure --prefix=/usr/$(cross_host) \
+				--cache-file=$(config_cache_cross) \
+				--host=$(cross_host) \
+				--build=$(cross_build) \
+				--enable-debug \
+		&& $(MAKE)
+	touch $@
+
+
 clean: debian/control
 	dh_testdir
 	dh_testroot
-	rm -rf $(build_stamps) $(objdirs)
-	-cd utils/wxPython/src && $(MAKE) clean
-	-cd utils/wxPython/modules/html && $(MAKE) clean
-	-cd utils/wxPython/modules/utils && $(MAKE) clean
+
+	rm -rf config_deb.cache config_deb_cross.cache control-files-stamp $(build_stamps) $(objdirs)
+	rm -f docs/lgpl.txt
+	rm -f docs/latex/wx/manual.bb
+	rm -f $(objdir_i18n)/*.mo
+
+	cd wxPython \
+		&& ./setup.py clean \
+		&& rm -rf licence \
+		&& rm -rf build \
+		&& rm -rf contrib/gizmos/contrib \
+		&& rm -rf contrib/ogl/contrib \
+		&& rm -rf contrib/stc/contrib \
+		&& rm -rf contrib/xrc/contrib \
+		&& rm -rf *.pyc
+
 	dh_clean
 	rm -f debian/$(package_wxbase_lib).*
 	rm -f debian/$(package_wxbase_dev).*
+	rm -f debian/$(package_wxbase_dbg).*
 	rm -f debian/$(package_gtk_lib).*
 	rm -f debian/$(package_gtk_dev).*
+	rm -f debian/$(package_gtk_dbg).*
+	rm -f debian/$(package_gtk_univ).*
 	rm -f debian/$(package_gtk_py).*
+	rm -f debian/$(package_gtk_contrib).*
+	rm -f debian/$(package_gtk_contrib_dev).*
+	rm -f debian/$(package_headers).*
+	rm -f debian/$(package_i18n).*
 	rm -f debian/$(package_doc).*
 	rm -f debian/$(package_examples).*
+	rm -f debian/$(package_wxbase_msw_dev).*
+	rm -f debian/$(package_wxbase_msw_dbg).*
+	rm -f debian/$(package_msw_dev).*
+	rm -f debian/$(package_msw_dbg).*
+	rm -f debian/$(package_headers_msw).*
+
+install_arch: build_arch $(install_all_arch)
 
-install: build
+install: build_all $(install_all_native)
+
+install-wxbase-lib: DH_OPTIONS=-p$(package_wxbase_lib)
+install-wxbase-lib: build-wxbase-shared-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cp -a $(objdir_wxbase_shared)/lib/* debian/$(package_wxbase_lib)/usr/lib
+	cp $(objdir_wxbase_shared)/wxbase-$(release)-config debian/$(package_wxbase_lib)/usr/bin/
+
+install-wxbase-dev: DH_OPTIONS=-p$(package_wxbase_dev)
+install-wxbase-dev: build-wxbase-static-stamp install-wxbase-lib
 	dh_testdir
 	dh_testroot
-	@for f in dirs docs files postinst; do \
-		echo "generating control file $(package_wxbase_lib).$$f"; \
-		cp debian/libwxbase.$$f debian/$(package_wxbase_lib).$$f; \
-	done;
-	@for f in dirs docs files links postinst prerm; do \
-		echo "generating control file $(package_wxbase_dev).$$f"; \
-		cp debian/libwxbase-dev.$$f debian/$(package_wxbase_dev).$$f; \
-	done;
-	@for f in dirs docs files postinst; do \
-		echo "generating control file $(package_gtk_lib).$$f"; \
-		cp debian/libwxgtk.$$f debian/$(package_gtk_lib).$$f; \
-	done;
-	@for f in dirs docs files links postinst prerm; do \
-		echo "generating control file $(package_gtk_dev).$$f"; \
-		cp debian/libwxgtk-dev.$$f debian/$(package_gtk_dev).$$f; \
-	done;
-	@for f in dirs docs files postinst prerm; do \
-		echo "generating control file $(package_gtk_py).$$f"; \
-		cp debian/libwxgtk-python.$$f debian/$(package_gtk_py).$$f; \
-	done;
-	@for f in dirs docs doc-base; do \
-		echo "generating control file $(package_doc).$$f"; \
-		cp debian/wxwin-doc.$$f debian/$(package_doc).$$f; \
-	done;
-	@for f in docs examples; do \
-		echo "generating control file $(package_examples).$$f"; \
-		cp debian/wxwin-examples.$$f debian/$(package_examples).$$f; \
-	done;
 	dh_clean -k
 	dh_installdirs
+	dh_movefiles --sourcedir=debian/$(package_wxbase_lib)
+	cp $(objdir_wxbase_static)/lib/*.a debian/$(package_wxbase_dev)/usr/lib
+
+install-wxbase-dbg: DH_OPTIONS=-p$(package_wxbase_dbg)
+install-wxbase-dbg: build-wxbase-debug-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cp -a $(objdir_wxbase_debug)/lib/* debian/$(package_wxbase_dbg)/usr/lib
+	cp $(objdir_wxbase_debug)/wxbased-$(release)-config debian/$(package_wxbase_dbg)/usr/bin/
+	cp debian/lintian-override debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg)
+
+install-gtk-lib: DH_OPTIONS=-p$(package_gtk_lib)
+install-gtk-lib: build-gtk-shared-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs 
 	cd $(objdir_gtk_shared) \
-		&& $(MAKE) install prefix=`pwd`/../debian/tmp/usr
-	rm -f debian/tmp/usr/bin/wx-config
-	cp $(objdir_gtk_static)/lib/*.a debian/tmp/usr/lib
-	cp -a $(objdir_wxbase_shared)/lib/* debian/tmp/usr/lib
-	cp $(objdir_wxbase_shared)/wxbase-config debian/tmp/usr/bin/
-	cp $(objdir_wxbase_static)/lib/*.a debian/tmp/usr/lib
-	cd utils/wxPython/src \
-		&& ../distrib/build.py -i \
-			TARGETDIR=../../../debian/tmp/usr/lib/python1.5/site-packages/wxPython \
-			HELPERLIBDIR=../../../debian/tmp/usr/lib \
-			WXDIR=../../..
-	cd utils/wxPython/modules/html \
-		&& ../../distrib/build.py -i \
-			TARGETDIR=../../../../debian/tmp/usr/lib/python1.5/site-packages/wxPython \
-			WXDIR=../../../..
-	cd utils/wxPython/modules/utils \
-		&& ../../distrib/build.py -i \
-			TARGETDIR=../../../../debian/tmp/usr/lib/python1.5/site-packages/wxPython \
-			WXDIR=../../../..
-	rm -rf debian/tmp/usr/lib/python1.5/site-packages/wxPython/demo
-	find debian/tmp/usr/lib/python1.5/site-packages/wxPython \
-		-name '*.py?' -exec rm '{}' ';'
-	dh_movefiles
+		&& $(MAKE) install prefix=`pwd`/../debian/$(package_gtk_lib)/usr
+	rm -f debian/$(package_gtk_lib)/usr/bin/wx-config
 
+install-gtk-dev: DH_OPTIONS=-p$(package_gtk_dev)
+install-gtk-dev: build-gtk-static-stamp install-gtk-lib
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	dh_movefiles --sourcedir=debian/$(package_gtk_lib)
+	cp $(objdir_gtk_static)/lib/libwx_gtk*.a debian/$(package_gtk_dev)/usr/lib
 
-# Build architecture-independent files here.
-binary-indep: build install
-# nothing to do.
+install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
+install-gtk-dbg: build-gtk-debug-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cp -a $(objdir_gtk_debug)/lib/* debian/$(package_gtk_dbg)/usr/lib
+	cp $(objdir_gtk_debug)/wxgtkd-$(release)-config debian/$(package_gtk_dbg)/usr/bin/
+	cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)
 
-# Build architecture-dependent files here.
-binary-arch: build install
+install-gtk-univ: DH_OPTIONS=-p$(package_gtk_univ)
+install-gtk-univ: build-gtk-univ-stamp
 	dh_testdir
 	dh_testroot
-	dh_installdocs
-	dh_installmanpages -p$(package_gtk_dev) \
+	dh_clean -k
+	dh_installdirs
+	cp -a $(objdir_gtk_univ)/lib/* debian/$(package_gtk_univ)/usr/lib
+	cp $(objdir_gtk_univ)/wxgtkuniv-$(release)-config debian/$(package_gtk_univ)/usr/bin/
+	cp debian/lintian-override debian/$(package_gtk_univ)/usr/share/lintian/overrides/$(package_gtk_univ)
+
+install-gtk-contrib: DH_OPTIONS=-p$(package_gtk_contrib)
+install-gtk-contrib: build-contrib-shared-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cd $(objdir_gtk_shared)/contrib/src \
+		&& $(MAKE) install prefix=`pwd`/../../../debian/$(package_gtk_contrib)/usr
+
+install-gtk-contrib-dev: DH_OPTIONS=-p$(package_gtk_contrib_dev)
+install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-dev
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	dh_movefiles --sourcedir=debian/$(package_gtk_contrib)
+	cp $(objdir_gtk_static)/lib/*.a debian/$(package_gtk_contrib_dev)/usr/lib
+	rm -f debian/$(package_gtk_contrib_dev)/usr/lib/libwx_gtk*.a
+
+install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
+install-gtk-py: build-gtk-py-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cd wxPython \
+		&& ./setup.py install --prefix=`pwd`/../debian/$(package_gtk_py)/usr
+	find debian/$(package_gtk_py)/usr/lib/$(python_dir)/site-packages/wxPython \
+		-name '*.py?' -exec rm '{}' ';'
+
+install-headers: DH_OPTIONS=-p$(package_headers)
+install-headers: install-gtk-lib
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	dh_movefiles --sourcedir=debian/$(package_gtk_lib)
+	dh_installmanpages \
 		ansi2knr.1 \
 		jpegtran.1 \
-		libpng.3 \
+		libpng.3   \
 		libpngpf.3 \
-		zlib.3 \
+		zlib.3     \
 		png.5
+
+install-i18n: DH_OPTIONS=-p$(package_i18n)
+install-i18n: build-i18n-stamp install-gtk-lib
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	dh_movefiles --sourcedir=debian/$(package_gtk_lib)
+
+install-doc: DH_OPTIONS=-p$(package_doc)
+install-doc: build-doc-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+install-examples: DH_OPTIONS=-p$(package_examples)
+install-examples: build-examples-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+install-wxbase-msw-dev: DH_OPTIONS=-p$(package_wxbase_msw_dev)
+install-wxbase-msw-dev: build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cp -a $(objdir_wxbase_msw_shared)/lib/* debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib
+	cp -a $(objdir_wxbase_msw_static)/lib/*.a debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib
+	cp $(objdir_wxbase_msw_shared)/wxbase-$(release)-$(cross_host)-config debian/$(package_wxbase_msw_dev)/usr/bin/
+	$(cross_host)-strip --strip-debug debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib/*.a
+
+install-wxbase-msw-dbg: DH_OPTIONS=-p$(package_wxbase_msw_dbg)
+install-wxbase-msw-dbg: build-wxbase-msw-dbg-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cp -a $(objdir_wxbase_msw_dbg)/lib/* debian/$(package_wxbase_msw_dbg)/usr/$(cross_host)/lib
+	cp $(objdir_wxbase_msw_dbg)/wxbased-$(release)-$(cross_host)-config debian/$(package_wxbase_msw_dbg)/usr/bin/
+	# No static lib, they're freakin' huge!
+	#$(cross_host)-strip --strip-debug debian/$(package_wxbase_msw_dbg)/usr/$(cross_host)/lib/*.a
+
+install-msw-dev: DH_OPTIONS=-p$(package_msw_dev)
+install-msw-dev: build-msw-shared-stamp build-msw-static-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cp -a $(objdir_msw_shared)/lib/* debian/$(package_msw_dev)/usr/$(cross_host)/lib
+	cp -a $(objdir_msw_static)/lib/*.a debian/$(package_msw_dev)/usr/$(cross_host)/lib
+	cp $(objdir_msw_shared)/wxmsw-$(release)-$(cross_host)-config debian/$(package_msw_dev)/usr/bin/
+	$(cross_host)-strip --strip-debug debian/$(package_msw_dev)/usr/$(cross_host)/lib/*.a
+
+install-msw-dbg: DH_OPTIONS=-p$(package_msw_dbg)
+install-msw-dbg: build-msw-dbg-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cp -a $(objdir_msw_dbg)/lib/* debian/$(package_msw_dbg)/usr/$(cross_host)/lib
+	cp $(objdir_msw_dbg)/wxmswd-$(release)-$(cross_host)-config debian/$(package_msw_dbg)/usr/bin/
+	# No static lib, they're freakin' huge!
+	#$(cross_host)-strip --strip-debug debian/$(package_msw_dbg)/usr/$(cross_host)/lib/*.a
+
+install-headers-msw: DH_OPTIONS=-p$(package_headers_msw)
+install-headers-msw:
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	@# Symlink all the headers that will be installed by the main -headers
+	@# package to where the cross compiler will expect them.
+	@for f in `ls -1 include/wx`; do \
+		ln -s /usr/include/wx/$$f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx; \
+		echo "linking header /usr/include/wx/$$f"; \
+	done;
+	@# But install this lot for real.
+	rm -f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx/msw
+	cp -a include/wx/msw debian/$(package_headers_msw)/usr/$(cross_host)/include/wx
+	@# and remove this cruft(?)
+	rm -f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx/treelay.h
+
+
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installdocs
 	dh_installchangelogs
 	dh_installexamples
 	dh_link
-	dh_strip
+
+	@# Don't strip debug libs at all, and strip cross libs elsewhere
+	@# with the cross host tools until dh_strip gets smarter.
+	dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg) \
+		 -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) \
+		 -N$(package_msw_dev) -N$(package_msw_dbg)
+
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs
+	dh_makeshlibs -N$(package_gtk_py) -V
 	dh_installdeb
-	dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib:debian/$(package_gtk_py)/usr/lib
+	dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+# Build architecture-independent files here.
+# Note that you currently can't build the indep packages without first
+# building the arch specific package files needed to create them.
+binary-indep: build_all install
+	$(MAKE) -f debian/rules \
+		DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \
+		binary-common
+
+# Build just the architecture-dependent files here.
+binary-arch: build_arch install_arch
+	$(MAKE) -f debian/rules \
+		DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \
+		binary-common
+
+# Build all packages target.
+binary: binary-arch binary-indep
+
+# This is a special target for building the wxMSW-cross packages.
+# It's not currently called during the official package build run
+# but may be run separately to build the extra packages.
+# There is an implied build dep on the mingw32 cross compiler 
+# that is not in the control file.
+binary-cross: control-files-stamp $(install_all_cross)
+	$(MAKE) -f debian/rules \
+		DH_OPTIONS="-p$(package_wxbase_msw_dev) -p$(package_wxbase_msw_dbg) -p$(package_msw_dev) -p$(package_msw_dbg) -p$(package_headers_msw)" \
+		binary-common
+
+
+############################################################################
+#
+# Some rules to build a subset of the complete list of packages that can be
+# built from CVS.  Beware that packages produced with these rules may *NOT*
+# be compatible with packages built using the 'binary' target or even with
+# Debian policy.  Do not distribute packages built with these rules, they
+# are currently useful for rapid in-house testing by developers only.
+
+# libwxgtk shared lib package
+binary-gtk: control-files-stamp install-gtk-lib install-headers
+	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_lib) -p$(package_headers)" binary-common
+
+binary-gtk-dev: control-files-stamp install-gtk-dev install-headers
+	$(MAKE) -f debian/rules \
+	  DH_OPTIONS="-p$(package_gtk_lib) -p$(package_gtk_dev) -p$(package_headers)" \
+	  binary-common
+
+binary-gtk-dbg: control-files-stamp install-gtk-dbg install-headers
+	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_dbg) -p$(package_headers)" binary-common
+
+# libwxbase shared lib package
+binary-wxbase: control-files-stamp install-wxbase-lib install-headers
+	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_wxbase_lib) -p$(package_headers)" binary-common
+
+binary-wxbase-dev: control-files-stamp install-wxbase-dev install-headers
+	$(MAKE) -f debian/rules \
+	  DH_OPTIONS="-p$(package_wxbase_lib) -p$(package_wxbase_dev) -p$(package_headers)" \
+	  binary-common
+
+binary-wxbase-dbg: control-files-stamp install-wxbase-dbg install-headers
+	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_wxbase_dbg) -p$(package_headers)" binary-common
+
+binary-univ: control-files-stamp install-gtk-univ
+	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_univ)" binary-common
+
+# docs package
+binary-doc: control-files-stamp install-doc
+	$(MAKE) -f debian/rules DH_OPTIONS=-p$(package_doc) binary-common
+
+binary-fast:control-files-stamp install-gtk-dbg install-msw-dev install-headers install-headers-msw
+	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_dbg) -p$(package_msw_dev) -p$(package_headers) -p$(package_headers_msw)" binary-common
+
+
+.PHONY: build build_all build_arch clean binary-indep binary-arch binary binary-common \
+        binary-gtk binary-gtk-dev binary-gtk-dbg binary-wxbase binary-wxbase-dev \
+	binary-wxbase-dbg binary-doc binary-cross \
+	install install_arch install-wxbase-lib \
+        install-wxbase-dev install-wxbase-dbg install-gtk-lib install-gtk-dev \
+        install-gtk-dbg install-gtk-contrib install-gtk-contrib-dev \
+        install-gtk-py install-headers install-i18n install-doc install-examples \
+	install-wxbase-msw-dev install-msw-dev install-headers-msw \
+	install-wxbase-msw-dbg install-msw-dbg
+