mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rene Engelhard
2010-03-04 00:11:19 +01:00
parent e7f33a9afe
commit 2e10c0e2fc
26 changed files with 120 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
codemaker/test/cppumaker/makefile.mk
View File

@@ -33,6 +33,10 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk .INCLUDE: settings.mk
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
DLLPRE = # no leading "lib" on .so files DLLPRE = # no leading "lib" on .so files
INCPRE += $(MISC)$/$(TARGET)$/inc INCPRE += $(MISC)$/$(TARGET)$/inc

4
cppu/qa/makefile.mk
View File

@@ -33,6 +33,10 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk .INCLUDE: settings.mk
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
DLLPRE = # no leading "lib" on .so files DLLPRE = # no leading "lib" on .so files
INCPRE += $(MISC)$/$(TARGET)$/inc INCPRE += $(MISC)$/$(TARGET)$/inc

3
cppuhelper/qa/ifcontainer/makefile.mk
View File

@@ -35,6 +35,9 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
# BEGIN ---------------------------------------------------------------- # BEGIN ----------------------------------------------------------------
# auto generated Target:joblist by codegen.pl # auto generated Target:joblist by codegen.pl

4
cppuhelper/qa/propertysetmixin/makefile.mk
View File

@@ -45,6 +45,10 @@ my_file = file:///
my_file = file:// my_file = file://
.END .END
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
DLLPRE = # no leading "lib" on .so files DLLPRE = # no leading "lib" on .so files
INCPRE += -I$(MISC)/$(TARGET)/inc INCPRE += -I$(MISC)/$(TARGET)/inc

3
cppuhelper/qa/unourl/makefile.mk
View File

@@ -35,6 +35,9 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
# BEGIN ---------------------------------------------------------------- # BEGIN ----------------------------------------------------------------
# auto generated Target:joblist by codegen.pl # auto generated Target:joblist by codegen.pl

4
cppuhelper/qa/weak/makefile.mk
View File

@@ -33,6 +33,10 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk .INCLUDE: settings.mk
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
DLLPRE = # no leading "lib" on .so files DLLPRE = # no leading "lib" on .so files
SHL1TARGET = $(TARGET) SHL1TARGET = $(TARGET)

5
sal/qa/rtl/alloc/makefile.mk
View File

@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
CXXFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
# BEGIN ---------------------------------------------------------------- # BEGIN ----------------------------------------------------------------
# auto generated Target:jobfile by codegen.pl # auto generated Target:jobfile by codegen.pl
SHL1OBJS= \ SHL1OBJS= \

5
sal/qa/rtl/bootstrap/makefile.mk
View File

@@ -50,6 +50,11 @@ MY_SCRIPTCAT=tr -d "\015" <
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
CXXFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
# BEGIN ---------------------------------------------------------------- # BEGIN ----------------------------------------------------------------
# auto generated Target:joblist by codegen.pl # auto generated Target:joblist by codegen.pl
SHL1OBJS= \ SHL1OBJS= \

5
sal/qa/rtl/cipher/makefile.mk
View File

@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
CXXFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
# BEGIN ---------------------------------------------------------------- # BEGIN ----------------------------------------------------------------
# auto generated Target:joblist by codegen.pl # auto generated Target:joblist by codegen.pl
SHL1OBJS= \ SHL1OBJS= \

5
sal/qa/rtl/crc32/makefile.mk
View File

@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
CXXFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
# BEGIN ---------------------------------------------------------------- # BEGIN ----------------------------------------------------------------
# auto generated Target:jobfile by codegen.pl # auto generated Target:jobfile by codegen.pl
SHL1OBJS= \ SHL1OBJS= \

5
sal/qa/rtl/digest/makefile.mk
View File

@@ -41,6 +41,11 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
CXXFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
#----------------------------------- OStringBuffer ----------------------------------- #----------------------------------- OStringBuffer -----------------------------------
SHL1OBJS= \ SHL1OBJS= \

5
sal/qa/rtl/doublelock/makefile.mk
View File

@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
CXXFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
# BEGIN ---------------------------------------------------------------- # BEGIN ----------------------------------------------------------------
# auto generated Target:testjob by codegen.pl # auto generated Target:testjob by codegen.pl

5
sal/qa/rtl/locale/makefile.mk
View File

@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
CXXFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
# BEGIN ---------------------------------------------------------------- # BEGIN ----------------------------------------------------------------
# auto generated Target:locale by codegen.pl # auto generated Target:locale by codegen.pl
SHL1OBJS= \ SHL1OBJS= \

5
sal/qa/rtl/logfile/makefile.mk
View File

@@ -39,6 +39,11 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
CXXFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
# --- BEGIN -------------------------------------------------------- # --- BEGIN --------------------------------------------------------
SHL1OBJS= \ SHL1OBJS= \
$(SLO)$/rtl_logfile.obj $(SLO)$/rtl_logfile.obj

5
sal/qa/rtl/math/makefile.mk
View File

@@ -41,6 +41,11 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
CXXFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
#----------------------------------- OStringBuffer ----------------------------------- #----------------------------------- OStringBuffer -----------------------------------
SHL1OBJS= \ SHL1OBJS= \

5
sal/qa/rtl/ostring/makefile.mk
View File

@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
CXXFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
# BEGIN ---------------------------------------------------------------- # BEGIN ----------------------------------------------------------------
# auto generated Target:joblist by codegen.pl # auto generated Target:joblist by codegen.pl
SHL1OBJS= \ SHL1OBJS= \

5
sal/qa/rtl/oustring/makefile.mk
View File

@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
CXXFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
# BEGIN ---------------------------------------------------------------- # BEGIN ----------------------------------------------------------------
# auto generated Target:joblist by codegen.pl # auto generated Target:joblist by codegen.pl
SHL1OBJS= \ SHL1OBJS= \

5
sal/qa/rtl/oustringbuffer/makefile.mk
View File

@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
CXXFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
# BEGIN ---------------------------------------------------------------- # BEGIN ----------------------------------------------------------------
# auto generated Target:joblist by codegen.pl # auto generated Target:joblist by codegen.pl
SHL1OBJS= \ SHL1OBJS= \

5
sal/qa/rtl/process/makefile.mk
View File

@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
CXXFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
# BEGIN ---------------------------------------------------------------- # BEGIN ----------------------------------------------------------------
# auto generated Target:joblist by codegen.pl # auto generated Target:joblist by codegen.pl
SHL1OBJS= \ SHL1OBJS= \

5
sal/qa/rtl/random/makefile.mk
View File

@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
CXXFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
# BEGIN ---------------------------------------------------------------- # BEGIN ----------------------------------------------------------------
# auto generated Target:job by codegen.pl # auto generated Target:job by codegen.pl
SHL1OBJS= \ SHL1OBJS= \

5
sal/qa/rtl/strings/makefile.mk
View File

@@ -37,6 +37,11 @@ ENABLE_EXCEPTIONS := TRUE
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
CXXFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
SHL1TARGET := $(TARGET) SHL1TARGET := $(TARGET)
SHL1OBJS := \ SHL1OBJS := \
$(SLO)$/test_oustringbuffer_utf32.obj \ $(SLO)$/test_oustringbuffer_utf32.obj \

5
sal/qa/rtl/textenc/makefile.mk
View File

@@ -39,6 +39,11 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
CXXFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
# --- BEGIN -------------------------------------------------------- # --- BEGIN --------------------------------------------------------
SHL1OBJS= \ SHL1OBJS= \
$(SLO)$/rtl_textcvt.obj $(SLO)$/rtl_textcvt.obj

5
sal/qa/rtl/uri/makefile.mk
View File

@@ -39,6 +39,11 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
CXXFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
# --- BEGIN -------------------------------------------------------- # --- BEGIN --------------------------------------------------------
SHL1OBJS= \ SHL1OBJS= \
$(SLO)$/rtl_Uri.obj $(SLO)$/rtl_Uri.obj

5
sal/qa/rtl/uuid/makefile.mk
View File

@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
CXXFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
# BEGIN ---------------------------------------------------------------- # BEGIN ----------------------------------------------------------------
# auto generated Target:joblist by codegen.pl # auto generated Target:joblist by codegen.pl
SHL1OBJS= \ SHL1OBJS= \

4
salhelper/qa/makefile.mk
View File

@@ -33,6 +33,10 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk .INCLUDE: settings.mk
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
SHL1TARGET = $(TARGET) SHL1TARGET = $(TARGET)
SHL1OBJS = $(SLO)$/test_api.obj SHL1OBJS = $(SLO)$/test_api.obj
SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(SALHELPERLIB) $(TESTSHL2LIB) SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(SALHELPERLIB) $(TESTSHL2LIB)

4
stoc/test/uriproc/makefile.mk
View File

@@ -37,6 +37,10 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk .INCLUDE: settings.mk
.IF "$(SYSTEN_CPPUNIT)"=="YES"
CFLAGS+= $(CPPUNIT_CFLAGS)
.ENDIF
DLLPRE = # no leading "lib" on .so files DLLPRE = # no leading "lib" on .so files
SHL1TARGET = $(TARGET) SHL1TARGET = $(TARGET)