r19598 - in /desktop/unstable/pango1.0/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Wed Apr 15 11:23:44 2009
New Revision: 19598

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19598
Log:
Set opt_configure_flags to $(shared_configure_flags) in the sample opt
flavor for armel and move the opt flavor and check flavors below the
definition of other flags.

Modified:
    desktop/unstable/pango1.0/debian/changelog
    desktop/unstable/pango1.0/debian/rules

Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=19598&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog (original)
+++ desktop/unstable/pango1.0/debian/changelog Wed Apr 15 11:23:44 2009
@@ -7,6 +7,9 @@
   [ Loic Minier ]
   * Move udeb to Priority extra.
   * Drop duplicate Section/Priority fields.
+  * Set opt_configure_flags to $(shared_configure_flags) in the sample opt
+    flavor for armel and move the opt flavor and check flavors below the
+    definition of other flags.
 
  -- Josselin Mouette <joss at debian.org>  Wed, 08 Apr 2009 11:01:46 +0200
 

Modified: desktop/unstable/pango1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/rules?rev=19598&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/rules (original)
+++ desktop/unstable/pango1.0/debian/rules Wed Apr 15 11:23:44 2009
@@ -76,18 +76,6 @@
 # list of flavors we build; each gets a builddir, a configure pass (configure
 # args are defined below), a build pass, and an install pass (in two steps)
 FLAVORS := shared static udeb
-
-# optional optimized flavor for some arches
-OPTLIBDIR :=
-# sample code:
-#ifneq ($(filter $(DEB_HOST_ARCH), armel),)
-#FLAVORS += opt
-#OPTLIBDIR := $(LIBDIR)/vfp
-#opt_CFLAGS += $(CFLAGS) -mfpu=vfp -mfloat-abi=softfp
-#endif
-
-# list of flavors to run the test suite on
-CHECK_FLAVORS := $(filter opt shared, $(FLAVORS))
 
 # current flavor we're building; this is only expanded in flavor specific
 # targets
@@ -132,6 +120,19 @@
 udeb_configure_flags := $(configure_flags) \
 			--without-x \
 			--disable-debug
+
+# optional optimized flavor for some arches
+OPTLIBDIR :=
+# sample code:
+#ifneq ($(filter $(DEB_HOST_ARCH), armel),)
+#FLAVORS += opt
+#OPTLIBDIR := $(LIBDIR)/vfp
+#opt_CFLAGS += $(CFLAGS) -mfpu=vfp -mfloat-abi=softfp
+#opt_configure_flags := $(or $(shared_configure_flags),$(configure_flags))
+#endif
+
+# list of flavors to run the test suite on
+CHECK_FLAVORS := $(filter opt shared, $(FLAVORS))
 
 # macro computing the list of 'debian/<pkg>.*" files which have a corresponding
 # ".in" file; pass the list of packages in $(1)