diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-18 14:12:16 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-18 14:12:16 +0200 |
| commit | 6f0d3f2a5b72673086f82a88831535e535885998 (patch) | |
| tree | 95f35abd15a9842442e432cd064aea92288393d3 /RepositoryFixes.mk | |
| parent | 01a601fb2a7a3872599186ffb8c4c4be1500e678 (diff) | |
fixing rebase errors
Diffstat (limited to 'RepositoryFixes.mk')
| -rwxr-xr-x | RepositoryFixes.mk | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 776abec91e39..695c55e02ebd 100755 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -105,7 +105,9 @@ 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:= icule icuuc +gb_Library_NOILIBFILENAMES:=\ + icuuc \ + uwinapi \ 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)) @@ -113,8 +115,8 @@ gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib # some Windows platform libraries are missing in mingw library set # we have to use them from the PSDK by linking against their ilibs gb_Library_ILIBFILENAMES:=\ - unicows \ - uuid \ + unicows \ + uuid \ winmm \ gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES)) @@ -144,10 +146,13 @@ gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES) gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:libeay32%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssleay32%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES)) gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES)) + ifeq ($(gb_PRODUCT),$(true)) gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES)) else @@ -156,11 +161,7 @@ endif # change the names of all import libraries that don't have an "i" prefix as in our standard naming schema gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE) -gb_Library_NOILIBFILENAMES += icuuc \ - icule \ - imm32\ - msimg32 \ - winspool \ +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)) @@ -185,11 +186,4 @@ ifeq ($(USE_SYSTEM_STL),YES) gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS)) endif -ifeq ($(SYSTEM_OPENSSL),YES) -gb_StaticLibrary_TARGETS := $(filter-out crypto,$(gb_StaticLibrary_TARGETS)) -gb_StaticLibrary_TARGETS := $(filter-out ssl,$(gb_StaticLibrary_TARGETS)) -gb_Library_TARGETS := $(filter-out crypto,$(gb_Library_TARGETS)) -gb_Library_TARGETS := $(filter-out ssl,$(gb_Library_TARGETS)) -endif - # vim: set noet sw=4 ts=4: |