summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Engelhard <rene@openoffice.org>2010-03-04 00:11:19 +0100
committerRene Engelhard <rene@openoffice.org>2010-03-04 00:11:19 +0100
commit5acec7b9e4e00ad2afa99f57238aec22ddbb1d07 (patch)
treeeee2adf2b54973b076c80302b0954b016c2add87
parentb5da3c2cd0b4341c31e3620991b77680abb9f9c8 (diff)
sb118: add missing CFLAGS+= $(CPPUNIT_CFLAGS) to loads of other makefiles, too
-rw-r--r--smoketestoo_native/makefile.mk4
-rw-r--r--test/source/cpp/makefile.mk4
2 files changed, 8 insertions, 0 deletions
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index 1a0df1f0df0f..6171aa132241 100644
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@ -31,6 +31,10 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE: settings.mk
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
SLOFILES = $(SHL1OBJS)
SHL1TARGET = smoketest
diff --git a/test/source/cpp/makefile.mk b/test/source/cpp/makefile.mk
index 3d7db10abdf3..a22eba557cf6 100644
--- a/test/source/cpp/makefile.mk
+++ b/test/source/cpp/makefile.mk
@@ -34,6 +34,10 @@ VISIBILITY_HIDDEN = TRUE
CDEFS += -DOOO_DLLIMPLEMENTATION_TEST
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS += $(CPPUNIT_CFLAGS)
+.ENDIF
+
SLOFILES = \
$(SLO)/getargument.obj \
$(SLO)/officeconnection.obj \