diff options
| author | Pedro Giffuni <pfg@apache.org> | 2011-11-24 15:21:24 +0000 |
|---|---|---|
| committer | Pedro Giffuni <pfg@apache.org> | 2011-11-24 15:21:24 +0000 |
| commit | fcd3ba7227013f6993f324395377a84a60ddbf28 (patch) | |
| tree | 8855b0c393563a02fb674ececd2f3becda260d33 /solenv | |
| parent | 70010c2d7c6472ae40fb0a8fd97e9da159a220b8 (diff) | |
i118608 - IP clearance: Remove internal cppunit source, use system-cppunit instead. Patch by Andre Fischer (af).
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/freebsd.mk | 11 | ||||
| -rw-r--r-- | solenv/gbuild/platform/linux.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/os2.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/winmingw.mk | 3 |
7 files changed, 16 insertions, 9 deletions
diff --git a/solenv/gbuild/platform/freebsd.mk b/solenv/gbuild/platform/freebsd.mk index 8785e2d616d8..e4ea7ffcd077 100644 --- a/solenv/gbuild/platform/freebsd.mk +++ b/solenv/gbuild/platform/freebsd.mk @@ -271,15 +271,16 @@ endif gb_Library_PLAINLIBS_NONE += \ dl \ - freetype \ + freetype \ jpeg \ m \ pthread \ X11 \ - Xext \ - SM \ - ICE \ - z + Xext \ + SM \ + ICE \ + z \ + cppunit gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk index e0c74a8427ac..a2e6fa02854a 100644 --- a/solenv/gbuild/platform/linux.mk +++ b/solenv/gbuild/platform/linux.mk @@ -285,7 +285,8 @@ gb_Library_PLAINLIBS_NONE += \ Xext \ SM \ ICE \ - z + z \ + cppunit gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 2cedcee5fcb5..9ac97e1c29b2 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -328,6 +328,7 @@ gb_Library_PLAINLIBS_NONE += \ m \ pthread \ z \ + cppunit gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ diff --git a/solenv/gbuild/platform/os2.mk b/solenv/gbuild/platform/os2.mk index e9b95a80d6d7..fddc110225ab 100644 --- a/solenv/gbuild/platform/os2.mk +++ b/solenv/gbuild/platform/os2.mk @@ -389,7 +389,8 @@ gb_Library_PLAINLIBS_NONE += \ jpeg \ m \ z \ - pthread + pthread \ + cppunit gb_Library_LAYER := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 744ba293bbab..23c8af2aa505 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -265,7 +265,8 @@ gb_Library_PLAINLIBS_NONE += \ Xext \ SM \ ICE \ - z + z \ + cppunit gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 1b3ab6df9e50..ec4da317f1fa 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -466,6 +466,7 @@ gb_Library_PLAINLIBS_NONE += \ uwinapi \ winspool \ z \ + cppunit gb_Library_LAYER := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk index e17ef9551285..bc0123e76485 100644 --- a/solenv/gbuild/platform/winmingw.mk +++ b/solenv/gbuild/platform/winmingw.mk @@ -151,7 +151,7 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS) gb_LinkTarget_NOEXCEPTIONFLAGS := \ -DEXCEPTIONS_OFF \ -fno-exceptions \ - + gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS) gb_LinkTarget_LDFLAGS := \ @@ -490,6 +490,7 @@ gb_Library_PLAINLIBS_NONE += \ uwinapi \ winspool \ z \ + cppunit gb_Library_LAYER := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ |