[Pkg-xfce-commits] r4263 - desktop/branches/experimental/xfce4-session/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-09-05 14:13:21 +0000 (Sun, 05 Sep 2010)
New Revision: 4263

Modified:
   desktop/branches/experimental/xfce4-session/debian/changelog
   desktop/branches/experimental/xfce4-session/debian/rules
Log:
pick {C,LD}FLAGS from dpkg-buildflags.

Modified: desktop/branches/experimental/xfce4-session/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/changelog	2010-09-05 14:08:42 UTC (rev 4262)
+++ desktop/branches/experimental/xfce4-session/debian/changelog	2010-09-05 14:13:21 UTC (rev 4263)
@@ -10,10 +10,11 @@
     - don't pass libexecdir, useless now
     - update xfsm-shutdown-helper path in chrpath call.
     - update splash-engine path.
+    - pick {C,LD}FLAGS from dpkg-buildflags.
   * debian/xfce4-session.lintian-overrides:
     - drop xfsm-shutdown-helper and balou theme overrides, useless now.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Sep 2010 16:00:24 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Sep 2010 16:12:47 +0200
 
 xfce4-session (4.6.2-2) unstable; urgency=low
 

Modified: desktop/branches/experimental/xfce4-session/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/rules	2010-09-05 14:08:42 UTC (rev 4262)
+++ desktop/branches/experimental/xfce4-session/debian/rules	2010-09-05 14:13:21 UTC (rev 4263)
@@ -1,15 +1,9 @@
 #!/usr/bin/make -f
+
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
 override_dh_auto_configure:
 	dh_auto_configure
 	find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;