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 /tools | |
| parent | 7c85f9d5fe0c0d387115d8ad863b39496349bb1b (diff) | |
sb118: #i109791# improved CPPUNIT_CFLAGS handling
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qa/makefile.mk | 5 | ||||
| -rw-r--r-- | tools/test/makefile.mk | 4 |
2 files changed, 2 insertions, 7 deletions
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 ---------------------------------------------------------- |