diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-09-15 15:18:27 +0200 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2011-09-15 15:19:26 +0200 |
| commit | 538fd2b16616ad8dabc2b409eec9a54d756ff4d5 (patch) | |
| tree | 721d7fba889cddeecafe069f13fc9e8582838275 /RepositoryFixes.mk | |
| parent | 03c96971f467cdca31f372ee8f9af2fcedb314c8 (diff) | |
Repository.mk: fix conflicing filterconfig changes
Diffstat (limited to 'RepositoryFixes.mk')
| -rw-r--r-- | RepositoryFixes.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 2b9b1165b7a4..eb6a524d6dca 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -34,7 +34,6 @@ ifneq (,$(filter SOLARIS GCC,$(OS) $(COM))) gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst filterconfig:libfilterconfig%,filterconfig:libfilterconfig1%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES)) @@ -47,7 +46,6 @@ endif ifeq ($(OS),WNT) gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES)) -gb_Library_DLLFILENAMES := $(patsubst filterconfig:libfilterconfig%,filterconfig:libfilterconfig1%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst ucb:libucb%,ucb:libucb1%,$(gb_Library_DLLFILENAMES)) |