[Pkg-lyx-devel] svn commit: r205 - /lyx/trunk/debian/rules

[pelle at users.alioth.debian.org]

Author: pelle
Date: Wed Oct 25 16:59:06 2006
New Revision: 205

URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=205
Log:
some CFLAGS cleanups

Modified:
    lyx/trunk/debian/rules

Modified: lyx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/rules?rev=205&op=diff
==============================================================================
--- lyx/trunk/debian/rules (original)
+++ lyx/trunk/debian/rules Wed Oct 25 16:59:06 2006
@@ -11,18 +11,6 @@
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0
-else
-CFLAGS += -O2
-endif
-
-ifeq ($(DEB_HOST_ARCH),hppa)
-	CFLAGS += -ffunction-sections
-endif
-
 CONFIGURE_OPTIONS = \
 	--host=$(DEB_HOST_GNU_TYPE) \
 	--build=$(DEB_BUILD_GNU_TYPE) \
@@ -31,8 +19,6 @@
 	--mandir=/usr/share/man \
 	--disable-dependency-tracking \
 	--enable-warnings \
-	--disable-debug \
-	--enable-optimization=$$CXXFLAGS \
 	--enable-assertions \
 	--enable-nls \
 	--without-included-string \
@@ -44,6 +30,18 @@
 	--without-included-gettext \
 	--with-frontend="$(FRONTENDS)" \
 	--with-qt-dir=/usr/share/qt3 \
+
+CFLAGS += -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O2
+else
+	CFLAGS += -O0
+endif
+
+ifeq ($(DEB_HOST_ARCH),hppa)
+	CFLAGS += -ffunction-sections
+endif
 
 debian/control: debian/control.in debian/control.qt debian/control.xforms debian/control.gtk
 	set -e; \