diff options
| author | sb <sb@openoffice.org> | 2010-03-04 22:13:08 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-03-04 22:13:08 +0100 |
| commit | 1f8c841f58229855518cf09a3058288b0a65e403 (patch) | |
| tree | 12c910e19875aa133629fb38cbbcd797ae9fb869 | |
| parent | 7c85f9d5fe0c0d387115d8ad863b39496349bb1b (diff) | |
sb118: #i109791# improved CPPUNIT_CFLAGS handling
| -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 | 4 | ||||
| -rw-r--r-- | svl/qa/makefile.mk | 4 | ||||
| -rw-r--r-- | tools/qa/makefile.mk | 5 | ||||
| -rw-r--r-- | tools/test/makefile.mk | 4 |
7 files changed, 7 insertions, 22 deletions
diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk index 7dd374898641..ca77721716f7 100644 --- a/basebmp/test/makefile.mk +++ b/basebmp/test/makefile.mk @@ -60,9 +60,7 @@ CDEFS+=-xalias_level=compatible .ENDIF .ENDIF -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGS += $(CPPUNIT_CFLAGS) -.ENDIF +CFLAGSCXX += $(CPPUNIT_CFLAGS) # --- Common ---------------------------------------------------------- .IF "$(L10N_framework)"=="" diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk index e29f69bd3516..79e65f1af5fa 100644 --- a/basegfx/test/makefile.mk +++ b/basegfx/test/makefile.mk @@ -36,9 +36,7 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGS += $(CPPUNIT_CFLAGS) -.ENDIF +CFLAGSCXX += $(CPPUNIT_CFLAGS) # --- Common ---------------------------------------------------------- diff --git a/comphelper/qa/makefile.mk b/comphelper/qa/makefile.mk index 7c91456ac084..0360d308529e 100644 --- a/comphelper/qa/makefile.mk +++ b/comphelper/qa/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/o3tl/qa/makefile.mk b/o3tl/qa/makefile.mk index c126c90b0771..c6fbc52ce2b1 100644 --- a/o3tl/qa/makefile.mk +++ b/o3tl/qa/makefile.mk @@ -36,9 +36,7 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGS+= $(CPPUNIT_CFLAGS) -.ENDIF +CFLAGSCXX += $(CPPUNIT_CFLAGS) .IF "$(L10N_framework)"=="" # --- Common ---------------------------------------------------------- diff --git a/svl/qa/makefile.mk b/svl/qa/makefile.mk index 072dfe7093bc..7e8c7ee795cc 100644 --- a/svl/qa/makefile.mk +++ b/svl/qa/makefile.mk @@ -35,9 +35,7 @@ ENABLE_EXCEPTIONS = true .INCLUDE : settings.mk -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGS+= $(CPPUNIT_CFLAGS) -.ENDIF +CFLAGSCXX += $(CPPUNIT_CFLAGS) # BEGIN ---------------------------------------------------------------- # auto generated Target:job by codegen.pl diff --git a/tools/qa/makefile.mk b/tools/qa/makefile.mk index 4c633aad1946..abaea848c1db 100644 --- a/tools/qa/makefile.mk +++ b/tools/qa/makefile.mk @@ -32,10 +32,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 SHL1TARGET = test_pathutils diff --git a/tools/test/makefile.mk b/tools/test/makefile.mk index 7f00fe2748b3..ab2cfd8e6676 100644 --- a/tools/test/makefile.mk +++ b/tools/test/makefile.mk @@ -36,9 +36,7 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGS+= $(CPPUNIT_CFLAGS) -.ENDIF +CFLAGSCXX += $(CPPUNIT_CFLAGS) # --- Common ---------------------------------------------------------- |