sb118: add missing CFLAGS+= $(CPPUNIT_CFLAGS) to loads of other makefiles, too

2010-03-04 00:11:19 +01:00
parent e7f33a9afe
commit 2e10c0e2fc
26 changed files with 120 additions and 0 deletions
--- a/codemaker/test/cppumaker/makefile.mk
+++ b/codemaker/test/cppumaker/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
--- a/cppu/qa/makefile.mk
+++ b/cppu/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
--- 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
--- 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

--- 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
--- 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)
--- a/sal/qa/rtl/alloc/makefile.mk
+++ b/sal/qa/rtl/alloc/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)

+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:jobfile by codegen.pl
 SHL1OBJS=  \
--- a/sal/qa/rtl/bootstrap/makefile.mk
+++ b/sal/qa/rtl/bootstrap/makefile.mk
@@ -50,6 +50,11 @@ MY_SCRIPTCAT=tr -d "\015" <
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)

+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
--- a/sal/qa/rtl/cipher/makefile.mk
+++ b/sal/qa/rtl/cipher/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)

+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
--- a/sal/qa/rtl/crc32/makefile.mk
+++ b/sal/qa/rtl/crc32/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)

+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:jobfile by codegen.pl
 SHL1OBJS=  \
--- a/sal/qa/rtl/digest/makefile.mk
+++ b/sal/qa/rtl/digest/makefile.mk
@@ -41,6 +41,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)

+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 #----------------------------------- OStringBuffer -----------------------------------

 SHL1OBJS= \
--- a/sal/qa/rtl/doublelock/makefile.mk
+++ b/sal/qa/rtl/doublelock/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)

+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:testjob by codegen.pl

--- a/sal/qa/rtl/locale/makefile.mk
+++ b/sal/qa/rtl/locale/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)

+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:locale by codegen.pl
 SHL1OBJS=  \
--- a/sal/qa/rtl/logfile/makefile.mk
+++ b/sal/qa/rtl/logfile/makefile.mk
@@ -39,6 +39,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)

+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # --- BEGIN --------------------------------------------------------
 SHL1OBJS=  \
    $(SLO)$/rtl_logfile.obj
--- a/sal/qa/rtl/math/makefile.mk
+++ b/sal/qa/rtl/math/makefile.mk
@@ -41,6 +41,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)

+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 #----------------------------------- OStringBuffer -----------------------------------

 SHL1OBJS= \
--- a/sal/qa/rtl/ostring/makefile.mk
+++ b/sal/qa/rtl/ostring/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)

+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
--- a/sal/qa/rtl/oustring/makefile.mk
+++ b/sal/qa/rtl/oustring/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)

+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
--- a/sal/qa/rtl/oustringbuffer/makefile.mk
+++ b/sal/qa/rtl/oustringbuffer/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)

+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
--- a/sal/qa/rtl/process/makefile.mk
+++ b/sal/qa/rtl/process/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)

+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
--- a/sal/qa/rtl/random/makefile.mk
+++ b/sal/qa/rtl/random/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)

+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:job by codegen.pl
 SHL1OBJS=  \
--- a/sal/qa/rtl/strings/makefile.mk
+++ b/sal/qa/rtl/strings/makefile.mk
@@ -37,6 +37,11 @@ ENABLE_EXCEPTIONS := TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)

+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 SHL1TARGET := $(TARGET)
 SHL1OBJS := \
    $(SLO)$/test_oustringbuffer_utf32.obj \
--- a/sal/qa/rtl/textenc/makefile.mk
+++ b/sal/qa/rtl/textenc/makefile.mk
@@ -39,6 +39,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)

+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # --- BEGIN --------------------------------------------------------
 SHL1OBJS=  \
    $(SLO)$/rtl_textcvt.obj
--- a/sal/qa/rtl/uri/makefile.mk
+++ b/sal/qa/rtl/uri/makefile.mk
@@ -39,6 +39,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)

+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # --- BEGIN --------------------------------------------------------
 SHL1OBJS=  \
    $(SLO)$/rtl_Uri.obj
--- a/sal/qa/rtl/uuid/makefile.mk
+++ b/sal/qa/rtl/uuid/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)

+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
--- a/salhelper/qa/makefile.mk
+++ b/salhelper/qa/makefile.mk
@@ -33,6 +33,10 @@ ENABLE_EXCEPTIONS := TRUE

 .INCLUDE: settings.mk

+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)$/test_api.obj
 SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(SALHELPERLIB) $(TESTSHL2LIB)
--- a/stoc/test/uriproc/makefile.mk
+++ b/stoc/test/uriproc/makefile.mk
@@ -37,6 +37,10 @@ ENABLE_EXCEPTIONS := TRUE

 .INCLUDE: settings.mk

+.IF "$(SYSTEN_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 DLLPRE = # no leading "lib" on .so files

 SHL1TARGET = $(TARGET)