diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-04-12 15:10:35 +0000 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 13:48:56 +0200 |
| commit | 44f359776cc8852b12b1e0be9a7ad71d74c63685 (patch) | |
| tree | 25998feab64a98ba31566ea15703cb7bc35e695a | |
| parent | 407dbac9fb04d78d782c555d1236f10b45f5c501 (diff) | |
gnumake4: merge ooo34gsl01 [hg:6470e79f0039]
| -rwxr-xr-x | Repository.mk | 1 | ||||
| -rwxr-xr-x | RepositoryFixes.mk | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Repository.mk b/Repository.mk index 2b7918318544..a3a17c32cbab 100755 --- a/Repository.mk +++ b/Repository.mk @@ -106,7 +106,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ cppunit \ icule \ - cppunit \ )) diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 88de46a952c0..d34316436099 100755 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -102,7 +102,7 @@ endif # these are libraries built by OOo, but only a few of them # all other libraries built by OOo and all platform libraries (exceptions see below) are used without an import library # we link against their dlls in gcc format directly -gb_Library_NOILIBFILENAMES:= graphite_dll icule icuuc +gb_Library_NOILIBFILENAMES:= icule icuuc gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES)) gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT)) |