free argv in Unicode build

[wxWidgets.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index ae5606b716d843e9ac39250d47b25c04bc5dff0d..a534bbee407a4d54920a8acc18613a342c9bba6c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -271,6 +271,7 @@ build-gtk-shared-stamp:
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
+                               --enable-dynamic-loader \
                && $(MAKE)
        touch $@
 
@@ -287,6 +288,7 @@ build-gtk-static-stamp:
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
+                               --enable-dynamic-loader \
                && $(MAKE)
        touch $@
 
@@ -304,6 +306,7 @@ build-gtk-debug-stamp:
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
+                               --enable-dynamic-loader \
                && $(MAKE)
        touch $@
 
@@ -321,6 +324,7 @@ build-gtk-univ-stamp:
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
+                               --enable-dynamic-loader \
                && $(MAKE)
        touch $@
 
@@ -482,6 +486,7 @@ clean: debian/control
                && ./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 \
@@ -557,7 +562,8 @@ install-gtk-dev: build-gtk-static-stamp install-gtk-lib
        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-*.a debian/$(package_gtk_dev)/usr/lib
+       cp $(objdir_gtk_static)/lib/libwx_gtk_gl-*.a debian/$(package_gtk_dev)/usr/lib
 
 install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
 install-gtk-dbg: build-gtk-debug-stamp
@@ -577,6 +583,7 @@ install-gtk-univ: build-gtk-univ-stamp
        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
@@ -595,7 +602,8 @@ install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-dev
        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-*.a
+       rm -f debian/$(package_gtk_contrib_dev)/usr/lib/libwx_gtk_gl-*.a
 
 install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
 install-gtk-py: build-gtk-py-stamp
@@ -718,7 +726,9 @@ binary-common:
 
        @# 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_dbg) -N$(package_msw_dbg)
+       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
@@ -796,6 +806,9 @@ binary-univ: control-files-stamp install-gtk-univ
 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 \