summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsb <sb@openoffice.org>2010-03-04 22:13:08 +0100
committersb <sb@openoffice.org>2010-03-04 22:13:08 +0100
commitff783db420cdb801613ca46ffec6dc6812d9ad0d (patch)
treeb86171f215e3e0dfe211607979c3b516b7b46a83
parentfea6cf46ea0cc4f25aed62cb4f06377fe190661d (diff)
sb118: #i109791# improved CPPUNIT_CFLAGS handling
-rw-r--r--configmgr/qa/unit/makefile.mk4
-rw-r--r--desktop/qa/deployment_misc/makefile.mk5
-rwxr-xr-xshell/qa/makefile.mk4
3 files changed, 3 insertions, 10 deletions
diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk
index b6f1bb2e55ba..94b4c58c41c9 100644
--- a/configmgr/qa/unit/makefile.mk
+++ b/configmgr/qa/unit/makefile.mk
@@ -33,9 +33,7 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
DLLPRE = # no leading "lib" on .so files
diff --git a/desktop/qa/deployment_misc/makefile.mk b/desktop/qa/deployment_misc/makefile.mk
index d8a3317ff61f..15faef0dc46e 100644
--- a/desktop/qa/deployment_misc/makefile.mk
+++ b/desktop/qa/deployment_misc/makefile.mk
@@ -34,10 +34,7 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
.INCLUDE: $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
-
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
DLLPRE = # no leading "lib" on .so files
SHL1TARGET = $(TARGET)
diff --git a/shell/qa/makefile.mk b/shell/qa/makefile.mk
index b918d571adfa..cc91a6b1ad5c 100755
--- a/shell/qa/makefile.mk
+++ b/shell/qa/makefile.mk
@@ -37,9 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
# BEGIN ----------------------------------------------------------------
# auto generated Target:testjob by codegen.pl