diff options
| author | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2011-03-07 13:07:44 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 16:14:09 +0200 |
| commit | 493b594915946bab2807bb1f51e6118640e35fdc (patch) | |
| tree | 2a0b648b326282c1d1057784801548e0df65a289 /RepositoryFixes.mk | |
| parent | 7e49f82e7e6c1f51a226f7b0b7ee20c00bff1ce4 (diff) | |
[mq]: oox_gmake.patch [hg:d0beb4a8aa40]
Diffstat (limited to 'RepositoryFixes.mk')
| -rwxr-xr-x | RepositoryFixes.mk | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 49caf56406fd..776abec91e39 100755 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -87,6 +87,8 @@ 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:crypto%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssl%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) @@ -183,4 +185,11 @@ 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: |