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 | 2e10c0e2fcdb084ef04ea419f1698d561d5d0d80 (patch) | |
| tree | 5607faa3ac4fe14e58bf422eae8ea22dd1e78461 /cppuhelper/qa | |
| parent | e7f33a9afe6e83d23213f386bc03c9d790b118db (diff) | |
sb118: add missing CFLAGS+= $(CPPUNIT_CFLAGS) to loads of other makefiles, too
Diffstat (limited to 'cppuhelper/qa')
| -rw-r--r-- | cppuhelper/qa/ifcontainer/makefile.mk | 3 | ||||
| -rw-r--r-- | cppuhelper/qa/propertysetmixin/makefile.mk | 4 | ||||
| -rw-r--r-- | cppuhelper/qa/unourl/makefile.mk | 3 | ||||
| -rw-r--r-- | cppuhelper/qa/weak/makefile.mk | 4 |
4 files changed, 14 insertions, 0 deletions
diff --git a/cppuhelper/qa/ifcontainer/makefile.mk b/cppuhelper/qa/ifcontainer/makefile.mk index 1e93701d3859..4f3357d13bba 100644 --- a/cppuhelper/qa/ifcontainer/makefile.mk +++ b/cppuhelper/qa/ifcontainer/makefile.mk @@ -35,6 +35,9 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +.IF "$(SYSTEM_CPPUNIT)"=="YES" +CFLAGS+= $(CPPUNIT_CFLAGS) +.ENDIF # BEGIN ---------------------------------------------------------------- # auto generated Target:joblist by codegen.pl diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk index 03eb14b5c34e..5597dd4f1a50 100644 --- a/cppuhelper/qa/propertysetmixin/makefile.mk +++ b/cppuhelper/qa/propertysetmixin/makefile.mk @@ -45,6 +45,10 @@ 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 diff --git a/cppuhelper/qa/unourl/makefile.mk b/cppuhelper/qa/unourl/makefile.mk index 9c4e3bc86976..86a6671bf61f 100644 --- a/cppuhelper/qa/unourl/makefile.mk +++ b/cppuhelper/qa/unourl/makefile.mk @@ -35,6 +35,9 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +.IF "$(SYSTEM_CPPUNIT)"=="YES" +CFLAGS+= $(CPPUNIT_CFLAGS) +.ENDIF # BEGIN ---------------------------------------------------------------- # auto generated Target:joblist by codegen.pl diff --git a/cppuhelper/qa/weak/makefile.mk b/cppuhelper/qa/weak/makefile.mk index 771edb26cfe5..4fb9fda555b8 100644 --- a/cppuhelper/qa/weak/makefile.mk +++ b/cppuhelper/qa/weak/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 SHL1TARGET = $(TARGET) |