[SCM] SETI at home packaging branch, master, updated. debian/6.12_svn1305-2-8-gf108d0f

[Guo Yixuan]

The following commit has been merged in the master branch:
commit f108d0fa7f16ca1fa7472f7b0d28b1995428753b
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Tue May 29 22:27:05 2012 +0800

    Adjust debian/rules

diff --git a/debian/rules b/debian/rules
index 935f797..d48271a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,12 +41,14 @@ export LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)
 #endif
 
 
-CXXFLAGS += -O3
-CXXFLAGS += -I/usr/include/boinc -I/usr/include/boinc/lib -I/usr/include/boinc/api
-# some handwritten rules in client/Makefile.am seems to use CFLAGS only
-# [FIXME] remove duplicates
-CFLAGS += -O3
-CFLAGS += -I/usr/include/boinc -I/usr/include/boinc/lib -I/usr/include/boinc/api
+# Append this to CFLAGS and CXXFLAGS.
+CFLAGS_APPEND += -O3
+CFLAGS_APPEND += -I/usr/include/boinc -I/usr/include/boinc/lib -I/usr/include/boinc/api
+
+# Although all source file are C++, some handwritten rules in
+# client/Makefile.am seem to use CFLAGS only.
+CFLAGS   += $(CFLAGS_APPEND)
+CXXFLAGS += $(CFLAGS_APPEND)
 
 
 SETIEXTRAFLAGS=

-- 
SETI at home packaging