diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-09-20 00:49:49 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-09-20 00:51:38 +0200 |
| commit | f62a449a53a73db81768082b89f3b9db466af460 (patch) | |
| tree | 3dc409667dd8406e4fc4828fa5e53226169b4903 /RepositoryFixes.mk | |
| parent | 3540bfb994de7dd0d0029713e14504d60027fd8d (diff) | |
Kill the explicit linking to salmain.o, use vclmain instead.
Diffstat (limited to 'RepositoryFixes.mk')
| -rw-r--r-- | RepositoryFixes.mk | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index aa37877cb047..16f1c8f0d546 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -39,9 +39,6 @@ gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salh gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst ucb:libucb%,ucb:libucb1%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst ucpfile:libucpfile%,ucpfile:libucpfile1%,$(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) @@ -59,7 +56,6 @@ 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:salmain.lib,salmain:salmain.obj,$(gb_StaticLibrary_FILENAMES)) ifeq ($(COM),GCC) gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES)) |