[Pkg-lyx-devel] svn commit: r204 - in /lyx/trunk/debian: changelog rules

[hoaxter-guest at users.alioth.debian.org]

Author: hoaxter-guest
Date: Thu Oct 19 13:37:36 2006
New Revision: 204

URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=204
Log:
Take the CFLAGS back in the game

Modified:
    lyx/trunk/debian/changelog
    lyx/trunk/debian/rules

Modified: lyx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/changelog?rev=204&op=diff
==============================================================================
--- lyx/trunk/debian/changelog (original)
+++ lyx/trunk/debian/changelog Thu Oct 19 13:37:36 2006
@@ -1,8 +1,7 @@
 lyx (1.4.3-2) UNRELEASED; urgency=low
 
   [ Sven Hoexter ]
-  * Removed CFLAGS related stuff from rules because it's useless since
-    LyX is C++ code only.
+  * Use CFLAGS as CXXFLAGS because LyX is C++ code.
   * Adding -ffunctions-sections as a workaround for builds on hppa.
   * Adding texlive-latex-base as an alternative Build-Dep
     (wished by Gudjon I. Gudjonsson)

Modified: lyx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/rules?rev=204&op=diff
==============================================================================
--- lyx/trunk/debian/rules (original)
+++ lyx/trunk/debian/rules Thu Oct 19 13:37:36 2006
@@ -11,8 +11,16 @@
 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)
-	CXXFLAGS += -ffunction-sections
+	CFLAGS += -ffunction-sections
 endif
 
 CONFIGURE_OPTIONS = \
@@ -63,7 +71,7 @@
 		|| ln -s /usr/share/misc/config.guess config/config.guess
 
 	test -d build-tree || mkdir build-tree
-	cd build-tree && CXXFLAGS="$(CXXFLAGS)" ../configure $(CONFIGURE_OPTIONS)
+	cd build-tree && CXXFLAGS="$(CFLAGS)" ../configure $(CONFIGURE_OPTIONS)
 	cd build-tree && $(MAKE)
 	touch build-stamp