diff options
| author | David Tardon <dtardon@redhat.com> | 2011-09-15 07:10:22 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-09-15 07:10:22 +0200 |
| commit | 45589f1f27be2d93c250e900102d66af0d2b694d (patch) | |
| tree | 065fd3eb1679c31c96f460a9d02c7ced4e65604c /RepositoryFixes.mk | |
| parent | 6c8a7e0e6ad223051442ef6ce1d1103086c3f4a0 (diff) | |
gbuildize automation
Diffstat (limited to 'RepositoryFixes.mk')
| -rw-r--r-- | RepositoryFixes.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 185d2fcb32b7..fed52cd904c8 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -37,6 +37,9 @@ gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_c 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)) + +# TODO: this is a hack; we should really build salmain as a regular static library +gb_StaticLibrary_FILENAMES := $(subst salmain:libsalmain.a,salmain:salmain.o,$(gb_StaticLibrary_FILENAMES)) endif ifeq ($(OS),WNT) @@ -52,6 +55,7 @@ gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES)) gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES)) +gb_StaticLibrary_FILENAMES := $(subst salmain:libsalmain.a,salmain:salmain.obj,$(gb_StaticLibrary_FILENAMES)) ifeq ($(COM),GCC) gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES)) |