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 | 6c036b980c1d58243cb7ab468de6b067941790dd (patch) | |
| tree | 8bf7d8386415839b48e3be1bc09f03bd2ea7634e /cppuhelper | |
| parent | 2e10c0e2fcdb084ef04ea419f1698d561d5d0d80 (diff) | |
sb118: #i109791# improved CPPUNIT_CFLAGS handling
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/qa/ifcontainer/makefile.mk | 4 | ||||
| -rw-r--r-- | cppuhelper/qa/propertysetmixin/makefile.mk | 5 | ||||
| -rw-r--r-- | cppuhelper/qa/unourl/makefile.mk | 4 | ||||
| -rw-r--r-- | cppuhelper/qa/weak/makefile.mk | 5 |
4 files changed, 4 insertions, 14 deletions
diff --git a/cppuhelper/qa/ifcontainer/makefile.mk b/cppuhelper/qa/ifcontainer/makefile.mk index 4f3357d13bba..3277b4c204ea 100644 --- a/cppuhelper/qa/ifcontainer/makefile.mk +++ b/cppuhelper/qa/ifcontainer/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:joblist by codegen.pl diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk index 5597dd4f1a50..edd4795fc115 100644 --- a/cppuhelper/qa/propertysetmixin/makefile.mk +++ b/cppuhelper/qa/propertysetmixin/makefile.mk @@ -45,12 +45,9 @@ my_file = file:/// my_file = file:// .END -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGS+= $(CPPUNIT_CFLAGS) -.ENDIF - DLLPRE = # no leading "lib" on .so files INCPRE += -I$(MISC)/$(TARGET)/inc +CFLAGSCXX += $(CPPUNIT_CFLAGS) SHL1TARGET = $(TARGET) SHL1OBJS = $(SLO)/test_propertysetmixin.obj diff --git a/cppuhelper/qa/unourl/makefile.mk b/cppuhelper/qa/unourl/makefile.mk index 86a6671bf61f..de2c05d40bc1 100644 --- a/cppuhelper/qa/unourl/makefile.mk +++ b/cppuhelper/qa/unourl/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:joblist by codegen.pl diff --git a/cppuhelper/qa/weak/makefile.mk b/cppuhelper/qa/weak/makefile.mk index 4fb9fda555b8..543e87118a75 100644 --- a/cppuhelper/qa/weak/makefile.mk +++ b/cppuhelper/qa/weak/makefile.mk @@ -33,10 +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 SHL1TARGET = $(TARGET) |