diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-18 12:26:08 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-18 16:51:31 +0300 |
| commit | 19aef0d44364449701e228261dad1be09d7b5615 (patch) | |
| tree | da0ce683eed76f93a018a58bc381035c7d00b5ac /RepositoryFixes.mk | |
| parent | 297a2dfa089e5f165a8debc7b208516457c2a8ec (diff) | |
Avoid duplication
Diffstat (limited to 'RepositoryFixes.mk')
| -rw-r--r-- | RepositoryFixes.mk | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index a57b61214dfe..5155f5055f0e 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -30,7 +30,7 @@ # Make has no support for 'or' clauses in conditionals, # we use a filter expression instead. -ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD IOS ANDROID, $(OS))) +ifneq (,$(filter LINUX MACOSX DRAGONFLY OPENBSD FREEBSD NETBSD IOS ANDROID, $(OS))) 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 jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES)) @@ -41,16 +41,6 @@ gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelpe endif -ifeq ($(OS),MACOSX) -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 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)) - -endif - - ifeq ($(OS),WNT) ifneq ($(USE_MINGW),) gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES)) |