X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/763141418818d2fe0dbdc8ce6d9f654700f1fe33..be0b002a3e815be81e604e4a47a7d297c7c01f71:/debian/rules

diff --git a/debian/rules b/debian/rules
index 05f0096717..dfc84b823e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,6 +55,7 @@ objdir_examples=docs/examples
 objdir_i18n=locale
 
 objdir_gtk_univ=objs_gtk_univ
+objdir_univ_install=objs_univ_install
 
 objdir_wxbase_msw_shared=objs_wxbase_msw_sh
 objdir_wxbase_msw_static=objs_wxbase_msw_st
@@ -65,7 +66,7 @@ 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_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)
 
@@ -271,6 +272,7 @@ build-gtk-shared-stamp:
 				--with-libjpeg=sys \
 				--with-libpng=sys \
 				--with-libtiff=sys \
+				--enable-dynamic-loader \
 		&& $(MAKE)
 	touch $@
 
@@ -287,6 +289,7 @@ build-gtk-static-stamp:
 				--with-libjpeg=sys \
 				--with-libpng=sys \
 				--with-libtiff=sys \
+				--enable-dynamic-loader \
 		&& $(MAKE)
 	touch $@
 
@@ -304,6 +307,7 @@ build-gtk-debug-stamp:
 				--with-libjpeg=sys \
 				--with-libpng=sys \
 				--with-libtiff=sys \
+				--enable-dynamic-loader \
 		&& $(MAKE)
 	touch $@
 
@@ -321,6 +325,7 @@ build-gtk-univ-stamp:
 				--with-libjpeg=sys \
 				--with-libpng=sys \
 				--with-libtiff=sys \
+				--enable-dynamic-loader \
 		&& $(MAKE)
 	touch $@
 
@@ -482,6 +487,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 +563,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
@@ -596,7 +603,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
@@ -615,7 +623,17 @@ install-headers: install-gtk-lib
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
+
+# The only way to be really sure we get the univ headers correct is to install
+# 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
+
+	dh_movefiles --sourcedir=$(objdir_univ_install)
 	dh_movefiles --sourcedir=debian/$(package_gtk_lib)
+
 	dh_installmanpages \
 		ansi2knr.1 \
 		jpegtran.1 \
@@ -715,6 +733,7 @@ binary-common:
 	dh_installdocs
 	dh_installchangelogs
 	dh_installexamples
+	dh_installmenu
 	dh_link
 
 	@# Don't strip debug libs at all, and strip cross libs elsewhere