]> git.saurik.com Git - wxWidgets.git/blobdiff - debian/rules
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
compilation fix
[wxWidgets.git] / debian / rules
diff --git a/debian/rules b/debian/rules
index dfc84b823eafc721415dafa256b4add2082c851e..2498c5b38c89a2334371773d2400c6afc9879111 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -49,6 +49,8 @@ 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_gtk_shared=objs_gtk_sh
 objdir_gtk_static=objs_gtk_st
 objdir_gtk_debug=objs_gtk_d
+objdir_gtk_install=objs_gtk_install
+objdir_gtk_contrib_install=objs_gtk_contrib_install
 objdir_doc_cruft=objs_doc_con
 objdir_doc=docs/wxWindows-manual.html
 objdir_examples=docs/examples
 objdir_doc_cruft=objs_doc_con
 objdir_doc=docs/wxWindows-manual.html
 objdir_examples=docs/examples
@@ -65,10 +67,13 @@ objdir_msw_static=objs_msw_st
 objdir_msw_dbg=objs_msw_d
 
 objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
 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_univ_install) $(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)
+       $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug)          \
+       $(objdir_gtk_install) $(objdir_gtk_contrib_install) $(objdir_gtk_univ) \
+       $(objdir_univ_install) $(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
 
 #      note that the i18n package is actually arch indep (once built)
 #      but must be built (and installed) during the arch any phase as
@@ -78,10 +83,12 @@ objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
 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_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-contrib-shared-stamp build-contrib-static-stamp \
                   build-gtk-py-stamp build-i18n-stamp
 
+# disable gtk-univ build, we'll  replace it with x11-univ later.
+#                build-gtk-univ-stamp
+
 build_indep_stamps=build-examples-stamp build-doc-stamp
 
 build_cross_stamps=build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp \
 build_indep_stamps=build-examples-stamp build-doc-stamp
 
 build_cross_stamps=build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp \
@@ -95,10 +102,12 @@ 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 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-gtk-contrib install-gtk-contrib-dev install-gtk-py \
                  install-headers install-i18n
 
+# disable gtk-univ build, we'll  replace it with x11-univ later.
+#                install-gtk-univ
+
 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_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
@@ -124,7 +133,7 @@ control-files-stamp: debian/control
                echo "generating control file $(package_wxbase_lib).$$f"; \
                cp debian/libwxbase.$$f debian/$(package_wxbase_lib).$$f; \
        done;
                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 \
+       @for f in dirs 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; \
                echo "generating control file $(package_wxbase_dev).$$f"; \
                sed -e 's/=V/$(release)/g' < debian/libwxbase-dev.$$f \
                        > debian/$(package_wxbase_dev).$$f; \
@@ -138,7 +147,7 @@ control-files-stamp: debian/control
                echo "generating control file $(package_gtk_lib).$$f"; \
                cp debian/libwxgtk.$$f debian/$(package_gtk_lib).$$f; \
        done;
                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 \
+       @for f in dirs 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; \
                echo "generating control file $(package_gtk_dev).$$f"; \
                sed -e 's/=V/$(release)/g' < debian/libwxgtk-dev.$$f \
                        > debian/$(package_gtk_dev).$$f; \
@@ -148,12 +157,7 @@ control-files-stamp: debian/control
                sed -e 's/=V/$(release)/g' < debian/libwxgtk-dbg.$$f \
                        > debian/$(package_gtk_dbg).$$f; \
        done;
                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 \
+       @for f in dirs docs menu 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; \
                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; \
@@ -162,15 +166,15 @@ control-files-stamp: debian/control
                echo "generating control file $(package_gtk_contrib).$$f"; \
                cp debian/libwxgtk-contrib.$$f debian/$(package_gtk_contrib).$$f; \
        done;
                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 \
+       @for f in dirs; do \
                echo "generating control file $(package_gtk_contrib_dev).$$f"; \
                cp debian/libwxgtk-contrib-dev.$$f debian/$(package_gtk_contrib_dev).$$f; \
        done;
                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 \
+       @for f in dirs; do \
                echo "generating control file $(package_headers).$$f"; \
                cp debian/wxwin-headers.$$f debian/$(package_headers).$$f; \
        done;
                echo "generating control file $(package_headers).$$f"; \
                cp debian/wxwin-headers.$$f debian/$(package_headers).$$f; \
        done;
-       @for f in dirs files; do \
+       @for f in dirs; do \
                echo "generating control file $(package_i18n).$$f"; \
                cp debian/wxwin-i18n.$$f debian/$(package_i18n).$$f; \
        done;
                echo "generating control file $(package_i18n).$$f"; \
                cp debian/wxwin-i18n.$$f debian/$(package_i18n).$$f; \
        done;
@@ -208,6 +212,11 @@ control-files-stamp: debian/control
                sed -e 's/=H/$(cross_host)/g' < debian/wxwin-headers-msw.$$f \
                        > debian/$(package_headers_msw).$$f; \
        done;
                sed -e 's/=H/$(cross_host)/g' < debian/wxwin-headers-msw.$$f \
                        > debian/$(package_headers_msw).$$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;
        touch $@
 
 build_arch: control-files-stamp $(build_arch_stamps)
        touch $@
 
 build_arch: control-files-stamp $(build_arch_stamps)
@@ -222,7 +231,7 @@ build_all: control-files-stamp $(build_stamps_native)
 build: build_arch
 
 
 build: build_arch
 
 
-build-wxbase-shared-stamp:
+configure-wxbase-shared-stamp:
        dh_testdir
        mkdir -p $(objdir_wxbase_shared)
        cd $(objdir_wxbase_shared) \
        dh_testdir
        mkdir -p $(objdir_wxbase_shared)
        cd $(objdir_wxbase_shared) \
@@ -230,11 +239,15 @@ build-wxbase-shared-stamp:
                                --cache-file=$(config_cache) \
                                --disable-gui \
                                --enable-soname \
                                --cache-file=$(config_cache) \
                                --disable-gui \
                                --enable-soname \
-                               --with-zlib=sys \
-               && $(MAKE)
+                               --with-zlib=sys
+       touch $@
+
+build-wxbase-shared-stamp: configure-wxbase-shared-stamp
+       dh_testdir
+       cd $(objdir_wxbase_shared) && $(MAKE)
        touch $@
 
        touch $@
 
-build-wxbase-static-stamp:
+configure-wxbase-static-stamp:
        dh_testdir
        mkdir -p $(objdir_wxbase_static)
        cd $(objdir_wxbase_static) \
        dh_testdir
        mkdir -p $(objdir_wxbase_static)
        cd $(objdir_wxbase_static) \
@@ -242,11 +255,15 @@ build-wxbase-static-stamp:
                                --cache-file=$(config_cache) \
                                --disable-gui \
                                --disable-shared \
                                --cache-file=$(config_cache) \
                                --disable-gui \
                                --disable-shared \
-                               --with-zlib=sys \
-               && $(MAKE)
+                               --with-zlib=sys
        touch $@
 
        touch $@
 
-build-wxbase-debug-stamp:
+build-wxbase-static-stamp: configure-wxbase-static-stamp
+       dh_testdir
+       cd $(objdir_wxbase_static) && $(MAKE)
+       touch $@
+
+configure-wxbase-debug-stamp:
        dh_testdir
        mkdir -p $(objdir_wxbase_debug)
        cd $(objdir_wxbase_debug) \
        dh_testdir
        mkdir -p $(objdir_wxbase_debug)
        cd $(objdir_wxbase_debug) \
@@ -255,11 +272,15 @@ build-wxbase-debug-stamp:
                                --disable-gui \
                                --enable-debug \
                                --enable-soname \
                                --disable-gui \
                                --enable-debug \
                                --enable-soname \
-                               --with-zlib=sys \
-               && $(MAKE)
+                               --with-zlib=sys
+       touch $@
+
+build-wxbase-debug-stamp: configure-wxbase-debug-stamp
+       dh_testdir
+       cd $(objdir_wxbase_debug) && $(MAKE)
        touch $@
 
        touch $@
 
-build-gtk-shared-stamp:
+configure-gtk-shared-stamp:
        dh_testdir
        mkdir -p $(objdir_gtk_shared)
        cd $(objdir_gtk_shared) \
        dh_testdir
        mkdir -p $(objdir_gtk_shared)
        cd $(objdir_gtk_shared) \
@@ -272,11 +293,15 @@ build-gtk-shared-stamp:
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
-                               --enable-dynamic-loader \
-               && $(MAKE)
+                               --enable-dynamic-loader
+       touch $@
+
+build-gtk-shared-stamp: configure-gtk-shared-stamp
+       dh_testdir
+       cd $(objdir_gtk_shared) && $(MAKE)
        touch $@
 
        touch $@
 
-build-gtk-static-stamp:
+configure-gtk-static-stamp:
        dh_testdir
        mkdir -p $(objdir_gtk_static)
        cd $(objdir_gtk_static) \
        dh_testdir
        mkdir -p $(objdir_gtk_static)
        cd $(objdir_gtk_static) \
@@ -289,11 +314,15 @@ build-gtk-static-stamp:
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
-                               --enable-dynamic-loader \
-               && $(MAKE)
+                               --enable-dynamic-loader
+       touch $@
+
+build-gtk-static-stamp: configure-gtk-static-stamp
+       dh_testdir
+       cd $(objdir_gtk_static) && $(MAKE)
        touch $@
 
        touch $@
 
-build-gtk-debug-stamp:
+configure-gtk-debug-stamp:
        dh_testdir
        mkdir -p $(objdir_gtk_debug)
        cd $(objdir_gtk_debug) \
        dh_testdir
        mkdir -p $(objdir_gtk_debug)
        cd $(objdir_gtk_debug) \
@@ -307,11 +336,15 @@ build-gtk-debug-stamp:
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
-                               --enable-dynamic-loader \
-               && $(MAKE)
+                               --enable-dynamic-loader
        touch $@
 
        touch $@
 
-build-gtk-univ-stamp:
+build-gtk-debug-stamp: configure-gtk-debug-stamp
+       dh_testdir
+       cd $(objdir_gtk_debug) && $(MAKE)
+       touch $@
+
+configure-gtk-univ-stamp:
        dh_testdir
        mkdir -p $(objdir_gtk_univ)
        cd $(objdir_gtk_univ) \
        dh_testdir
        mkdir -p $(objdir_gtk_univ)
        cd $(objdir_gtk_univ) \
@@ -325,8 +358,12 @@ build-gtk-univ-stamp:
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
-                               --enable-dynamic-loader \
-               && $(MAKE)
+                               --enable-dynamic-loader
+       touch $@
+
+build-gtk-univ-stamp: configure-gtk-univ-stamp
+       dh_testdir
+       cd $(objdir_gtk_univ) && $(MAKE)
        touch $@
 
 build-contrib-shared-stamp: build-gtk-shared-stamp
        touch $@
 
 build-contrib-shared-stamp: build-gtk-shared-stamp
@@ -399,7 +436,7 @@ build-i18n-stamp: build-gtk-shared-stamp
                && $(MAKE) allmo
        touch $@
 
                && $(MAKE) allmo
        touch $@
 
-build-wxbase-msw-shared-stamp:
+configure-wxbase-msw-shared-stamp:
        dh_testdir
        mkdir -p $(objdir_wxbase_msw_shared)
        cd $(objdir_wxbase_msw_shared) \
        dh_testdir
        mkdir -p $(objdir_wxbase_msw_shared)
        cd $(objdir_wxbase_msw_shared) \
@@ -407,11 +444,15 @@ build-wxbase-msw-shared-stamp:
                                --cache-file=$(config_cache_cross) \
                                --host=$(cross_host) \
                                --build=$(cross_build) \
                                --cache-file=$(config_cache_cross) \
                                --host=$(cross_host) \
                                --build=$(cross_build) \
-                               --disable-gui \
-               && $(MAKE)
+                               --disable-gui
+       touch $@
+
+build-wxbase-msw-shared-stamp: configure-wxbase-msw-shared-stamp
+       dh_testdir
+       cd $(objdir_wxbase_msw_shared) && $(MAKE)
        touch $@
 
        touch $@
 
-build-wxbase-msw-static-stamp:
+configure-wxbase-msw-static-stamp:
        dh_testdir
        mkdir -p $(objdir_wxbase_msw_static)
        cd $(objdir_wxbase_msw_static) \
        dh_testdir
        mkdir -p $(objdir_wxbase_msw_static)
        cd $(objdir_wxbase_msw_static) \
@@ -420,12 +461,16 @@ build-wxbase-msw-static-stamp:
                                --host=$(cross_host) \
                                --build=$(cross_build) \
                                --disable-gui \
                                --host=$(cross_host) \
                                --build=$(cross_build) \
                                --disable-gui \
-                               --disable-shared \
-               && $(MAKE)
+                               --disable-shared
+       touch $@
+
+build-wxbase-msw-static-stamp: configure-wxbase-msw-static-stamp
+       dh_testdir
+       cd $(objdir_wxbase_msw_static) && $(MAKE)
        touch $@
 
 # Note this builds dll only, since wxmsw static debug is > 130MB !
        touch $@
 
 # Note this builds dll only, since wxmsw static debug is > 130MB !
-build-wxbase-msw-dbg-stamp:
+configure-wxbase-msw-dbg-stamp:
        dh_testdir
        mkdir -p $(objdir_wxbase_msw_dbg)
        cd $(objdir_wxbase_msw_dbg) \
        dh_testdir
        mkdir -p $(objdir_wxbase_msw_dbg)
        cd $(objdir_wxbase_msw_dbg) \
@@ -434,22 +479,30 @@ build-wxbase-msw-dbg-stamp:
                                --host=$(cross_host) \
                                --build=$(cross_build) \
                                --disable-gui \
                                --host=$(cross_host) \
                                --build=$(cross_build) \
                                --disable-gui \
-                               --enable-debug \
-               && $(MAKE)
+                               --enable-debug
+       touch $@
+
+build-wxbase-msw-dbg-stamp: configure-wxbase-msw-dbg-stamp
+       dh_testdir
+       cd $(objdir_wxbase_msw_dbg) && $(MAKE)
        touch $@
 
        touch $@
 
-build-msw-shared-stamp:
+configure-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) \
        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)
+                               --build=$(cross_build)
        touch $@
 
        touch $@
 
-build-msw-static-stamp:
+build-msw-shared-stamp: configure-msw-shared-stamp
+       dh_testdir
+       cd $(objdir_msw_shared) && $(MAKE)
+       touch $@
+
+configure-msw-static-stamp:
        dh_testdir
        mkdir -p $(objdir_msw_static)
        cd $(objdir_msw_static) \
        dh_testdir
        mkdir -p $(objdir_msw_static)
        cd $(objdir_msw_static) \
@@ -457,11 +510,15 @@ build-msw-static-stamp:
                                --cache-file=$(config_cache_cross) \
                                --host=$(cross_host) \
                                --build=$(cross_build) \
                                --cache-file=$(config_cache_cross) \
                                --host=$(cross_host) \
                                --build=$(cross_build) \
-                               --disable-shared \
-               && $(MAKE)
+                               --disable-shared
        touch $@
 
        touch $@
 
-build-msw-dbg-stamp:
+build-msw-static-stamp: configure-msw-static-stamp
+       dh_testdir
+       cd $(objdir_msw_static) && $(MAKE)
+       touch $@
+
+configure-msw-dbg-stamp:
        dh_testdir
        mkdir -p $(objdir_msw_dbg)
        cd $(objdir_msw_dbg) \
        dh_testdir
        mkdir -p $(objdir_msw_dbg)
        cd $(objdir_msw_dbg) \
@@ -469,8 +526,12 @@ build-msw-dbg-stamp:
                                --cache-file=$(config_cache_cross) \
                                --host=$(cross_host) \
                                --build=$(cross_build) \
                                --cache-file=$(config_cache_cross) \
                                --host=$(cross_host) \
                                --build=$(cross_build) \
-                               --enable-debug \
-               && $(MAKE)
+                               --enable-debug
+       touch $@
+
+build-msw-dbg-stamp: configure-msw-dbg-stamp
+       dh_testdir
+       cd $(objdir_msw_dbg) && $(MAKE)
        touch $@
 
 
        touch $@
 
 
@@ -478,13 +539,12 @@ clean: debian/control
        dh_testdir
        dh_testroot
 
        dh_testdir
        dh_testroot
 
-       rm -rf config_deb.cache config_deb_cross.cache control-files-stamp $(build_stamps) $(objdirs)
+       rm -rf config_deb.cache config_deb_cross.cache *-stamp $(objdirs)
        rm -f docs/lgpl.txt
        rm -f docs/latex/wx/manual.bb
        rm -f $(objdir_i18n)/*.mo
 
        cd wxPython \
        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 licence \
                && rm -rf build \
                && rm -rf contrib/gizmos/contrib \
@@ -493,6 +553,10 @@ clean: debian/control
                && rm -rf contrib/xrc/contrib \
                && rm -rf *.pyc
 
                && rm -rf contrib/xrc/contrib \
                && rm -rf *.pyc
 
+# We do the equivalent of this above by removing build, unfortunately
+# its not enough by itself to get the tree properly clean again.
+#              && ./setup.py clean
+
        dh_clean
        rm -f debian/$(package_wxbase_lib).*
        rm -f debian/$(package_wxbase_dev).*
        dh_clean
        rm -f debian/$(package_wxbase_lib).*
        rm -f debian/$(package_wxbase_dev).*
@@ -500,7 +564,6 @@ clean: debian/control
        rm -f debian/$(package_gtk_lib).*
        rm -f debian/$(package_gtk_dev).*
        rm -f debian/$(package_gtk_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_gtk_py).*
        rm -f debian/$(package_gtk_contrib).*
        rm -f debian/$(package_gtk_contrib_dev).*
@@ -508,6 +571,7 @@ clean: debian/control
        rm -f debian/$(package_i18n).*
        rm -f debian/$(package_doc).*
        rm -f debian/$(package_examples).*
        rm -f debian/$(package_i18n).*
        rm -f debian/$(package_doc).*
        rm -f debian/$(package_examples).*
+       rm -f debian/$(package_gtk_univ).*
        rm -f debian/$(package_wxbase_msw_dev).*
        rm -f debian/$(package_wxbase_msw_dbg).*
        rm -f debian/$(package_msw_dev).*
        rm -f debian/$(package_wxbase_msw_dev).*
        rm -f debian/$(package_wxbase_msw_dbg).*
        rm -f debian/$(package_msw_dev).*
@@ -524,17 +588,17 @@ install-wxbase-lib: build-wxbase-shared-stamp
        dh_testroot
        dh_clean -k
        dh_installdirs
        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/
+       dh_install $(objdir_wxbase_shared)/lib/*.so.*   usr/lib
 
 install-wxbase-dev: DH_OPTIONS=-p$(package_wxbase_dev)
 
 install-wxbase-dev: DH_OPTIONS=-p$(package_wxbase_dev)
-install-wxbase-dev: build-wxbase-static-stamp install-wxbase-lib
+install-wxbase-dev: build-wxbase-static-stamp
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
-       dh_movefiles --sourcedir=debian/$(package_wxbase_lib)
-       cp $(objdir_wxbase_static)/lib/*.a debian/$(package_wxbase_dev)/usr/lib
+       dh_install $(objdir_wxbase_shared)/wxbase-$(release)-config     usr/bin
+       dh_install $(objdir_wxbase_shared)/lib/{wx,*.so}                usr/lib
+       dh_install $(objdir_wxbase_static)/lib/*.a                      usr/lib
 
 install-wxbase-dbg: DH_OPTIONS=-p$(package_wxbase_dbg)
 install-wxbase-dbg: build-wxbase-debug-stamp
 
 install-wxbase-dbg: DH_OPTIONS=-p$(package_wxbase_dbg)
 install-wxbase-dbg: build-wxbase-debug-stamp
@@ -542,29 +606,35 @@ install-wxbase-dbg: build-wxbase-debug-stamp
        dh_testroot
        dh_clean -k
        dh_installdirs
        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/
+       dh_install $(objdir_wxbase_debug)/wxbased-$(release)-config     usr/bin
+       dh_install $(objdir_wxbase_debug)/lib                           usr
        cp debian/lintian-override debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg)
 
        cp debian/lintian-override debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg)
 
+install-gtk-shared-stamp:
+       dh_testdir
+       mkdir -p $(objdir_gtk_install)
+       cd $(objdir_gtk_shared) \
+               && $(MAKE) install prefix=`pwd`/../$(objdir_gtk_install)
+       touch $@
+
 install-gtk-lib: DH_OPTIONS=-p$(package_gtk_lib)
 install-gtk-lib: DH_OPTIONS=-p$(package_gtk_lib)
-install-gtk-lib: build-gtk-shared-stamp
+install-gtk-lib: build-gtk-shared-stamp install-gtk-shared-stamp
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs 
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs 
-       cd $(objdir_gtk_shared) \
-               && $(MAKE) install prefix=`pwd`/../debian/$(package_gtk_lib)/usr
-       rm -f debian/$(package_gtk_lib)/usr/bin/wx-config
+       dh_install $(objdir_gtk_install)/share/wx       usr/share
+       dh_install $(objdir_gtk_install)/lib/*.so.*     usr/lib
 
 install-gtk-dev: DH_OPTIONS=-p$(package_gtk_dev)
 
 install-gtk-dev: DH_OPTIONS=-p$(package_gtk_dev)
-install-gtk-dev: build-gtk-static-stamp install-gtk-lib
+install-gtk-dev: build-gtk-static-stamp install-gtk-shared-stamp
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
        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
-       cp $(objdir_gtk_static)/lib/libwx_gtk_gl-*.a debian/$(package_gtk_dev)/usr/lib
+       dh_install $(objdir_gtk_install)/bin/wxgtk-$(release)-config    usr/bin
+       dh_install $(objdir_gtk_install)/lib/{wx,*.so}                  usr/lib
+       dh_install $(objdir_gtk_static)/lib/libwx_gtk{-,_gl}*.a         usr/lib
 
 install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
 install-gtk-dbg: build-gtk-debug-stamp
 
 install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
 install-gtk-dbg: build-gtk-debug-stamp
@@ -572,8 +642,8 @@ install-gtk-dbg: build-gtk-debug-stamp
        dh_testroot
        dh_clean -k
        dh_installdirs
        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/
+       dh_install $(objdir_gtk_debug)/wxgtkd-$(release)-config         usr/bin
+       dh_install $(objdir_gtk_debug)/lib                              usr
        cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)
 
 install-gtk-univ: DH_OPTIONS=-p$(package_gtk_univ)
        cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)
 
 install-gtk-univ: DH_OPTIONS=-p$(package_gtk_univ)
@@ -582,29 +652,35 @@ install-gtk-univ: build-gtk-univ-stamp
        dh_testroot
        dh_clean -k
        dh_installdirs
        dh_testroot
        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/
+       dh_install $(objdir_gtk_univ)/wxgtkuniv-$(release)-config       usr/bin
+       dh_install $(objdir_gtk_univ)/lib                               usr
        cp debian/lintian-override debian/$(package_gtk_univ)/usr/share/lintian/overrides/$(package_gtk_univ)
 
        cp debian/lintian-override debian/$(package_gtk_univ)/usr/share/lintian/overrides/$(package_gtk_univ)
 
+install-gtk-contrib-stamp:
+       dh_testdir
+       mkdir -p $(objdir_gtk_contrib_install)/lib
+       cd $(objdir_gtk_shared)/contrib/src \
+               && $(MAKE) install prefix=`pwd`/../../../$(objdir_gtk_contrib_install)
+       touch $@
+
 install-gtk-contrib: DH_OPTIONS=-p$(package_gtk_contrib)
 install-gtk-contrib: DH_OPTIONS=-p$(package_gtk_contrib)
-install-gtk-contrib: build-contrib-shared-stamp
+install-gtk-contrib: build-contrib-shared-stamp install-gtk-contrib-stamp
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
-       cd $(objdir_gtk_shared)/contrib/src \
-               && $(MAKE) install prefix=`pwd`/../../../debian/$(package_gtk_contrib)/usr
+       dh_install $(objdir_gtk_contrib_install)/lib/*.so.*     usr/lib
 
 install-gtk-contrib-dev: DH_OPTIONS=-p$(package_gtk_contrib_dev)
 
 install-gtk-contrib-dev: DH_OPTIONS=-p$(package_gtk_contrib_dev)
-install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-dev
+install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-contrib-stamp
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
        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
-       rm -f debian/$(package_gtk_contrib_dev)/usr/lib/libwx_gtk_gl-*.a
+       dh_install $(objdir_gtk_contrib_install)/include        usr
+       dh_install $(objdir_gtk_contrib_install)/lib/*.so       usr/lib
+       dh_install -Xlibwx_gtk- -Xlibwx_gtk_gl- \
+                  $(objdir_gtk_static)/lib/*.a                 usr/lib
 
 install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
 install-gtk-py: build-gtk-py-stamp
 
 install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
 install-gtk-py: build-gtk-py-stamp
@@ -613,12 +689,23 @@ install-gtk-py: build-gtk-py-stamp
        dh_clean -k
        dh_installdirs
        cd wxPython \
        dh_clean -k
        dh_installdirs
        cd wxPython \
-               && ./setup.py install --prefix=`pwd`/../debian/$(package_gtk_py)/usr
+               && ./setup.py install \
+                             --prefix=`pwd`/../debian/$(package_gtk_py)/usr \
+                             WX_CONFIG='$(wxconfig)'
        find debian/$(package_gtk_py)/usr/lib/$(python_dir)/site-packages/wxPython \
                -name '*.py?' -exec rm '{}' ';'
 
        find debian/$(package_gtk_py)/usr/lib/$(python_dir)/site-packages/wxPython \
                -name '*.py?' -exec rm '{}' ';'
 
+       dh_installman debian/wxPython-tools.1
+       dh_link usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2py.1  \
+               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2xpm.1 \
+               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2png.1 \
+               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pycrust.1 \
+               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyshell.1 \
+               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/xrced.1   \
+               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/helpviewer.1
+
 install-headers: DH_OPTIONS=-p$(package_headers)
 install-headers: DH_OPTIONS=-p$(package_headers)
-install-headers: install-gtk-lib
+install-headers: install-gtk-shared-stamp
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_testdir
        dh_testroot
        dh_clean -k
@@ -628,27 +715,22 @@ install-headers: install-gtk-lib
 # them.  Do that in a scratch dirs, and move the gtk ones last, so at least
 # they win in the result of any uncaught conflict.
 
 # them.  Do that in a scratch dirs, and move the gtk ones last, so at least
 # they win in the result of any uncaught conflict.
 
-       cd $(objdir_gtk_univ) \
-               && $(MAKE) install prefix=`pwd`/../$(objdir_univ_install)/usr
+#      cd $(objdir_gtk_univ) \
+#              && $(MAKE) install prefix=`pwd`/../$(objdir_univ_install)/usr
 
 
-       dh_movefiles --sourcedir=$(objdir_univ_install)
-       dh_movefiles --sourcedir=debian/$(package_gtk_lib)
+#      dh_movefiles --sourcedir=$(objdir_univ_install)
+       dh_install $(objdir_gtk_install)/include        usr
+       dh_install $(objdir_gtk_install)/share/aclocal  usr/share
 
 
-       dh_installmanpages \
-               ansi2knr.1 \
-               jpegtran.1 \
-               libpng.3   \
-               libpngpf.3 \
-               zlib.3     \
-               png.5
+       dh_installman debian/wx-config.1
 
 install-i18n: DH_OPTIONS=-p$(package_i18n)
 
 install-i18n: DH_OPTIONS=-p$(package_i18n)
-install-i18n: build-i18n-stamp install-gtk-lib
+install-i18n: build-i18n-stamp install-gtk-shared-stamp
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
-       dh_movefiles --sourcedir=debian/$(package_gtk_lib)
+       dh_install $(objdir_gtk_install)/share/locale   usr/share
 
 install-doc: DH_OPTIONS=-p$(package_doc)
 install-doc: build-doc-stamp
 
 install-doc: DH_OPTIONS=-p$(package_doc)
 install-doc: build-doc-stamp
@@ -756,13 +838,13 @@ binary-common:
 # building the arch specific package files needed to create them.
 binary-indep: build_all install
        $(MAKE) -f debian/rules \
 # 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)" \
+               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) -N$(package_gtk_univ)" \
                binary-common
 
 # Build just the architecture-dependent files here.
 binary-arch: build_arch install_arch
        $(MAKE) -f debian/rules \
                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)" \
+               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) -N$(package_gtk_univ)" \
                binary-common
 
 # Build all packages target.
                binary-common
 
 # Build all packages target.
wxWidgets (Impactor)