X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fdebian%2Frules;h=431f8985a6c4c289a468dc2b65d0862513b0b307;hb=a2ae8dfea31fc1495e3a97b28f3ddca01f491bef;hp=b5fe2dd9e191b99d1ff641f2ba11772886515088;hpb=4539c6b2081290b53592b5ded98099abc0b60939;p=citadel.git

diff --git a/citadel/debian/rules b/citadel/debian/rules
index b5fe2dd9e..431f8985a 100755
--- a/citadel/debian/rules
+++ b/citadel/debian/rules
@@ -11,26 +11,40 @@ export DH_OPTIONS
 
 DEB_DESTDIR = $(CURDIR)/debian/tmp
 
-CFLAGS = -Wall -g
-
+CFLAGS = -Wall -g -Werror=format-security 
 
+COMPILER=
 EXTRA_ARGS=
 PROFILE_ARGS=
-#to enable debugging: export DEB_BUILD_OPTIONS="debug profiling threadoff rss"
+#to enable debugging: export DEB_BUILD_OPTIONS="debug profiling threadoff rss gcov clang cares"
+ifneq (,$(findstring clang,$(DEB_BUILD_OPTIONS)))
+        COMPILER="clang" 
+endif
 ifneq (,$(findstring profiling,$(DEB_BUILD_OPTIONS)))
 	PROFILE_ARGS= --with-gprof
 endif
+
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0 -ggdb -rdynamic -D_GNU_SOURCE -MD -MP -D TECH_PREVIEW
+	CFLAGS += -O0 -ggdb -rdynamic -D_GNU_SOURCE -MD -MP -D TECH_PREVIEW -Wcast-align
 	LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed
 	EXTRA_ARGS = --with-backtrace
+	ifneq (,$(findstring event,$(DEB_BUILD_OPTIONS)))
+		EXTRA_ARGS = --with-backtrace --with-experimental_eventsmtp
+	endif
 else
 	LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed
 	CFLAGS += -O2
 endif
 
+ifneq (,$(findstring backtrace,$(DEB_BUILD_OPTIONS)))
+	CFLAGS+= -rdynamic -D_GNU_SOURCE -MD -MP
+	LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed
+	EXTRA_ARGS += --with-backtrace
+endif
+
 ifneq (,$(findstring threadoff,$(DEB_BUILD_OPTIONS)))
 	THREAD_ARGS=--without-threaded-client
+	CFLAGS += -D WITH_THREADLOG
 else
 	THREAD_ARGS=
 endif
@@ -40,15 +54,24 @@ ifneq (,$(findstring rss,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -D DEBUG_RSS
 endif
 
+ifneq (,$(findstring cares,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -D DEBUG_CARES
+endif
+
 ifneq (,$(findstring iodbg,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -D BIGBAD_IODBG
+	CFLAGS += -D BIGBAD_IODBG -D LDAP_INITIALIZE
+endif
+
+ifneq (,$(findstring gcov,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -fprofile-arcs -ftest-coverage
+	LDFLAGS += -fprofile-arcs -ftest-coverage
 endif
 
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 
-	LDFLAGS="$(LDFLAGS)"; CFLAGS="$(CFLAGS)" ./configure \
+	export CC=$(COMPILER); export LDFLAGS="$(LDFLAGS)"; export CFLAGS="$(CFLAGS)"; ./configure \
 		--prefix=/var/lib/citadel/ \
 		--with-datadir=/var/lib/citadel/ \
 		--with-helpdir=/usr/share/citadel-server/ \