r19597 - in /desktop/experimental/gtk+2.0/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Wed Apr 15 10:03:44 2009
New Revision: 19597

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19597
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/experimental/gtk+2.0/debian/changelog
    desktop/experimental/gtk+2.0/debian/rules

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=19597&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Wed Apr 15 10:03:44 2009
@@ -1,6 +1,9 @@
 gtk+2.0 (2.16.1-2) UNRELEASED; urgency=low
 
   * Fix test-print-backend configure flag addition.
+  * 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.
 
  -- Loic Minier <lool at dooz.org>  Tue, 14 Apr 2009 23:20:54 +0200
 

Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=19597&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules (original)
+++ desktop/experimental/gtk+2.0/debian/rules Wed Apr 15 10:03:44 2009
@@ -92,22 +92,6 @@
 # args are defined below), a build pass, and an install pass (in two steps)
 # Note: the shared flavor is required
 FLAVORS := directfb shared static
-
-# 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 directfb opt shared static, $(FLAVORS))
-# don't run the directfb testsuite on kfreebsd as it hangs; see #431477
-ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
-CHECK_FLAVORS := $(filter-out directfb, $(CHECK_FLAVORS))
-endif
 
 # current flavor we're building; this is only expanded in flavor specific
 # targets
@@ -159,6 +143,23 @@
 			--disable-static \
 			--enable-explicit-deps=yes \
 			--with-gdktarget=directfb
+
+# 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 := $(shared_configure_flags)
+#endif
+
+# list of flavors to run the test suite on
+CHECK_FLAVORS := $(filter directfb opt shared static, $(FLAVORS))
+# don't run the directfb testsuite on kfreebsd as it hangs; see #431477
+ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
+CHECK_FLAVORS := $(filter-out directfb, $(CHECK_FLAVORS))
+endif
 
 DH_INSTALLDOCS_FILES := NEWS README ChangeLog