diff options
| author | Rene Engelhard <rene@openoffice.org> | 2010-03-04 00:11:19 +0100 |
|---|---|---|
| committer | Rene Engelhard <rene@openoffice.org> | 2010-03-04 00:11:19 +0100 |
| commit | 7c85f9d5fe0c0d387115d8ad863b39496349bb1b (patch) | |
| tree | 91110c2a0abe17dd1a253e6c5efec80b6b57c8a7 | |
| parent | 17feb1f6049deb8a388f0bf6fa625c95231dccae (diff) | |
sb118: add missing CFLAGS+= $(CPPUNIT_CFLAGS) to loads of other makefiles, too
| -rw-r--r-- | basebmp/test/makefile.mk | 4 | ||||
| -rw-r--r-- | basegfx/test/makefile.mk | 4 | ||||
| -rw-r--r-- | comphelper/qa/makefile.mk | 4 | ||||
| -rw-r--r-- | o3tl/qa/makefile.mk | 5 | ||||
| -rw-r--r-- | svl/qa/makefile.mk | 4 | ||||
| -rw-r--r-- | tools/qa/makefile.mk | 4 | ||||
| -rw-r--r-- | tools/test/makefile.mk | 4 |
7 files changed, 29 insertions, 0 deletions
diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk index 610468b313fe..7dd374898641 100644 --- a/basebmp/test/makefile.mk +++ b/basebmp/test/makefile.mk @@ -60,6 +60,10 @@ CDEFS+=-xalias_level=compatible .ENDIF .ENDIF +.IF "$(SYSTEM_CPPUNIT)"=="YES" +CFLAGS += $(CPPUNIT_CFLAGS) +.ENDIF + # --- Common ---------------------------------------------------------- .IF "$(L10N_framework)"=="" diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk index 73a157e7dc3a..e29f69bd3516 100644 --- a/basegfx/test/makefile.mk +++ b/basegfx/test/makefile.mk @@ -36,6 +36,10 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +.IF "$(SYSTEM_CPPUNIT)"=="YES" +CFLAGS += $(CPPUNIT_CFLAGS) +.ENDIF + # --- Common ---------------------------------------------------------- SHL1OBJS= \ diff --git a/comphelper/qa/makefile.mk b/comphelper/qa/makefile.mk index 6e715675bb03..7c91456ac084 100644 --- a/comphelper/qa/makefile.mk +++ b/comphelper/qa/makefile.mk @@ -33,6 +33,10 @@ ENABLE_EXCEPTIONS := TRUE .INCLUDE: settings.mk +.IF "$(SYSTEM_CPPUNIT)"=="YES" +CFLAGS+= $(CPPUNIT_CFLAGS) +.ENDIF + DLLPRE = # no leading "lib" on .so files INCPRE += $(MISC)$/$(TARGET)$/inc diff --git a/o3tl/qa/makefile.mk b/o3tl/qa/makefile.mk index c75c3e972eea..c126c90b0771 100644 --- a/o3tl/qa/makefile.mk +++ b/o3tl/qa/makefile.mk @@ -35,6 +35,11 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk + +.IF "$(SYSTEM_CPPUNIT)"=="YES" +CFLAGS+= $(CPPUNIT_CFLAGS) +.ENDIF + .IF "$(L10N_framework)"=="" # --- Common ---------------------------------------------------------- diff --git a/svl/qa/makefile.mk b/svl/qa/makefile.mk index 4e107e31f924..072dfe7093bc 100644 --- a/svl/qa/makefile.mk +++ b/svl/qa/makefile.mk @@ -35,6 +35,10 @@ ENABLE_EXCEPTIONS = true .INCLUDE : settings.mk +.IF "$(SYSTEM_CPPUNIT)"=="YES" +CFLAGS+= $(CPPUNIT_CFLAGS) +.ENDIF + # BEGIN ---------------------------------------------------------------- # auto generated Target:job by codegen.pl SHL1OBJS= \ diff --git a/tools/qa/makefile.mk b/tools/qa/makefile.mk index 66ed19e20737..4c633aad1946 100644 --- a/tools/qa/makefile.mk +++ b/tools/qa/makefile.mk @@ -32,6 +32,10 @@ ENABLE_EXCEPTIONS = TRUE .INCLUDE: settings.mk +.IF "$(SYSTEM_CPPUNIT)"=="YES" +CFLAGS+= $(CPPUNIT_CFLAGS) +.ENDIF + DLLPRE = # no leading "lib" on .so files SHL1TARGET = test_pathutils diff --git a/tools/test/makefile.mk b/tools/test/makefile.mk index 5dea8ce6f960..7f00fe2748b3 100644 --- a/tools/test/makefile.mk +++ b/tools/test/makefile.mk @@ -36,6 +36,10 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +.IF "$(SYSTEM_CPPUNIT)"=="YES" +CFLAGS+= $(CPPUNIT_CFLAGS) +.ENDIF + # --- Common ---------------------------------------------------------- SHL1OBJS= \ |