diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-11-01 15:43:47 +0100 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-11-02 18:06:06 -0500 |
commit | 5f9cda2dc5e6d217328ff4f7da27a6f0e6fcf5de (patch) | |
tree | 48b6df03931dcaaae0ad82e6e21a0db2d95ca31f | |
parent | don't warn for empty VBA structure, fdo#61059 (diff) | |
download | core-5f9cda2dc5e6d217328ff4f7da27a6f0e6fcf5de.tar.gz core-5f9cda2dc5e6d217328ff4f7da27a6f0e6fcf5de.zip |
Repository*: no need to register libraries built via ExternalProject
Only libraries (and similar for executables) built as Library need to be
registered; those built via ExternalProject are delivered by Project and
used via gb_LinkTarget_add_libs. This also means there is no need to
mangle the names in RepositoryFixes.mk.
Change-Id: Ib0b67f54e2eb6efdb0c454c9e2dd599ada229676
Reviewed-on: https://gerrit.libreoffice.org/6533
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r-- | Repository.mk | 15 | ||||
-rw-r--r-- | RepositoryExternal.mk | 78 | ||||
-rw-r--r-- | RepositoryFixes.mk | 52 |
3 files changed, 3 insertions, 142 deletions
diff --git a/Repository.mk b/Repository.mk index b3e21fe74fd1..c490c6bf6d75 100644 --- a/Repository.mk +++ b/Repository.mk @@ -646,21 +646,6 @@ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \ passive_native \ )) -ifeq ($(OS),WNT) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - xmlsec1 \ -)) -ifeq ($(COM),MSC) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - xmlsec1-mscrypto \ -)) -else -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - xmlsec1-nss \ -)) -endif -endif - $(eval $(call gb_Helper_register_jars,URE, \ java_uno \ juh \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d3b8dc5f1167..568d2ac58837 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -192,10 +192,6 @@ endef else -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\ - cppunit \ -)) - define gb_LinkTarget__use_cppunit $(call gb_LinkTarget_use_external_project,$(1),cppunit) @@ -767,10 +763,6 @@ gb_ExternalProject__use_libxml2:= else # !SYSTEM_LIBXML -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ - xml2 \ -)) - define gb_LinkTarget__use_libxml2 $(call gb_LinkTarget_use_package,$(1),xml2) $(call gb_LinkTarget_set_include,$(1),\ @@ -820,11 +812,6 @@ endef else # !SYSTEM_LIBXSLT -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - exslt \ - xslt \ -)) - define gb_LinkTarget__use_libxslt $(call gb_LinkTarget_use_package,$(1),xslt) $(call gb_LinkTarget_set_include,$(1),\ @@ -990,11 +977,13 @@ endef ifneq ($(OS),ANDROID) +ifeq ($(COM),MSC) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ raptor2 \ rasqal \ rdf \ )) +endif define gb_LinkTarget__use_librdf $(call gb_LinkTarget_use_packages,$(1),raptor rasqal redland) @@ -1039,13 +1028,6 @@ endef else ifeq ($(SYSTEM_CAIRO),NO) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - cairo \ - $(if $(filter-out MACOSX WNT,$(OS)), \ - pixman-1 \ - ) \ -)) - define gb_LinkTarget__use_cairo $(call gb_LinkTarget_use_package,$(1),cairo) $(call gb_LinkTarget_use_package,$(1),pixman) @@ -1206,21 +1188,6 @@ $(call gb_ExternalProject_use_package,$(1),icu) endef # icudata and icui18n is called icudt and icuin when built with MSVC :-/ -ifeq ($(OS)$(COM),WNTMSC) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - icudt \ - icuin \ -)) -else -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - icudata$(gb_ICU_suffix) \ - icui18n$(gb_ICU_suffix) \ -)) -endif -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - icuuc$(gb_ICU_suffix) \ -)) - define gb_LinkTarget__use_icudata $(call gb_LinkTarget_use_package,$(1),icu) @@ -1323,13 +1290,6 @@ endef else # !SYSTEM_OPENSSL -ifeq ($(OS),WNT) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - crypto \ - ssl \ -)) -endif - define gb_ExternalProject__use_openssl $(call gb_ExternalProject_use_package,$(1),openssl) @@ -1745,10 +1705,6 @@ endef else -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - lcms2 \ -)) - define gb_LinkTarget__use_lcms2 $(call gb_LinkTarget_use_package,$(1),lcms2) $(call gb_LinkTarget_set_include,$(1),\ @@ -1775,10 +1731,6 @@ endef else # !SYSTEM_LPSOLVE -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - lpsolve55 \ -)) - define gb_LinkTarget__use_lpsolve $(call gb_LinkTarget_use_unpacked,$(1),lpsolve) ifeq ($(COM),MSC) @@ -2020,10 +1972,6 @@ endef else # !SYSTEM_CURL -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - curl \ -)) - define gb_LinkTarget__use_curl $(call gb_LinkTarget_use_package,$(1),curl) $(call gb_LinkTarget_set_include,$(1),\ @@ -2248,10 +2196,6 @@ else # !SYSTEM_FIREBIRD #$(call gb_LinkTarget__use_libatomic_ops,$(1)) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - fbembed \ -)) - define gb_LinkTarget__use_libfbembed $(call gb_LinkTarget_use_package,$(1),firebird) $(call gb_LinkTarget_set_include,$(1),\ @@ -2420,11 +2364,6 @@ endif # !GCC endef -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\ - xpcom \ - xpcom_core \ -)) - endif # DESKTOP ifeq ($(ENABLE_KDE),TRUE) @@ -2601,11 +2540,6 @@ endif endef -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ - python$(PYTHON_VERSION_MAJOR) \ - python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m \ -)) - endif # SYSTEM_PYTHON # ORCUS @@ -2740,14 +2674,6 @@ endef else -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ - nspr4 \ - nss3 \ - plc4 \ - smime3 \ - ssl3 \ -)) - define gb_LinkTarget__use_nss3 $(call gb_LinkTarget_use_package,$(1),nss) $(call gb_LinkTarget_set_include,$(1),\ diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index b648aa577676..cc37c50349f5 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -71,9 +71,6 @@ endif endif ifeq ($(OS),WNT) -gb_Library_ICU_LIBRARIES := icudt icuuc icuin -gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_ICU_LIBRARIES),$(lib):%),$(gb_Library_FILENAMES)) -gb_Library_FILENAMES += $(foreach lib,$(gb_Library_ICU_LIBRARIES),$(lib):$(lib)$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll) gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst rdf:rdf%,rdf:librdf%,$(gb_Library_FILENAMES)) @@ -81,13 +78,7 @@ gb_Library_FILENAMES := $(patsubst rdf:rdf%,rdf:librdf%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst pyuno:pyuno.dll,pyuno:pyuno$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd,$(gb_Library_FILENAMES)) ifeq ($(COM),GCC) -gb_Library_ILIBFILENAMES := $(patsubst crypto:icrypto%,crypto:crypto%,$(gb_Library_ILIBFILENAMES)) -gb_Library_ILIBFILENAMES := $(patsubst exslt:iexslt%,exslt:libexslt$(gb_Library_IARCEXT),$(gb_Library_ILIBFILENAMES)) gb_Library_ILIBFILENAMES := $(patsubst libexttextcat:liblibext%,libexttextcat:libilibext%,$(gb_Library_ILIBFILENAMES)) -gb_Library_ILIBFILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_ILIBFILENAMES)) -gb_Library_ILIBFILENAMES := $(patsubst ssl:issl%,ssl:ssl%,$(gb_Library_ILIBFILENAMES)) -gb_Library_ILIBFILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_ILIBFILENAMES)) -gb_Library_ILIBFILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt$(gb_Library_IARCEXT),$(gb_Library_ILIBFILENAMES)) gb_Library_ILIBFILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_ILIBFILENAMES)) # Libraries not provided by mingw(-w64), available only in the Windows @@ -100,62 +91,21 @@ gb_Library_SDKLIBFILENAMES:= gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_SDKLIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES)) gb_Library_FILENAMES += $(foreach lib,$(gb_Library_SDKLIBFILENAMES),$(lib):$(WINDOWS_SDK_HOME)/lib/$(lib).lib) -gb_Library_FILENAMES := $(patsubst crypto:crypto%,crypto:libeay32%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst ssl:ssl%,ssl:ssleay32%,$(gb_Library_FILENAMES)) - else # $(COM) != GCC -gb_Library_ILIBFILENAMES := $(patsubst cppunit:icppunit%,cppunit:icppunit_dll%,$(gb_Library_ILIBFILENAMES)) -gb_Library_ILIBFILENAMES := $(patsubst crypto:icrypto%,crypto:libeay32%,$(gb_Library_ILIBFILENAMES)) -gb_Library_ILIBFILENAMES := $(patsubst crypto:libcrypto%,crypto:libcrypto_static%,$(gb_Library_ILIBFILENAMES)) -gb_Library_ILIBFILENAMES := $(patsubst ssl:issl%,ssl:ssleay32%,$(gb_Library_ILIBFILENAMES)) -gb_Library_ILIBFILENAMES := $(patsubst ssl:libssl%,ssl:libssl_static%,$(gb_Library_ILIBFILENAMES)) -gb_Library_ILIBFILENAMES := $(patsubst xmlsec1:ixmlsec1%,xmlsec1:libxmlsec%,$(gb_Library_ILIBFILENAMES)) -gb_Library_ILIBFILENAMES := $(patsubst xmlsec1-mscrypto:ixmlsec1-mscrypto%,xmlsec1-mscrypto:libxmlsec-mscrypto%,$(gb_Library_ILIBFILENAMES)) -gb_Library_ILIBFILENAMES := $(patsubst xmlsec1-nss:ixmlsec1-nss%,xmlsec1-nss:libxmlsec-nss%,$(gb_Library_ILIBFILENAMES)) gb_Library_ILIBFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_ILIBFILENAMES)) - -gb_Library_NOILIBFILENAMES_D := \ - icudt icuin icuuc \ - -# change the names of all import libraries that don't have an "i" prefix as in our standard naming schema -gb_Library_NOILIBFILENAMES := \ - langtag \ - lcms2 \ - lpsolve55 \ - xpcom \ - xpcom_core \ - nspr4 \ - nss3 \ - smime3 \ - # these have prefix "lib" instead of "i" gb_Library_LIBLIBFILENAMES := \ - curl \ - exslt \ rdf \ - xml2 \ - xslt \ gb_Library_ILIBFILENAMES := \ - $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%) \ - $(foreach lib,$(gb_Library_NOILIBFILENAMES_D),$(lib):%) \ - $(foreach lib,$(gb_Library_LIBLIBFILENAMES),$(lib):%) \ + $(filter-out $(foreach lib,$(gb_Library_LIBLIBFILENAMES),$(lib):%) \ ,$(gb_Library_ILIBFILENAMES)) gb_Library_ILIBFILENAMES += \ - $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT)) \ - $(foreach lib,$(gb_Library_NOILIBFILENAMES_D),$(lib):$(lib)$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(gb_Library_PLAINEXT)) \ $(foreach lib,$(gb_Library_LIBLIBFILENAMES),$(lib):lib$(lib)$(gb_Library_PLAINEXT)) gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_LIBLIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES)) gb_Library_FILENAMES += $(foreach lib,$(gb_Library_LIBLIBFILENAMES),$(lib):lib$(lib).dll) -gb_Library_FILENAMES := $(patsubst cppunit:cppunit%,cppunit:cppunit$(if $(MSVC_USE_DEBUG_RUNTIME),d)_dll%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst crypto:crypto%,crypto:libeay32%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst ssl:ssl%,ssl:ssleay32%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst fbembed:fbembed%,fbembed:ifbembed%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst xmlsec1:xmlsec1%,xmlsec1:libxmlsec%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst xmlsec1-mscrypto:xmlsec1-mscrypto%,xmlsec1-mscrypto:libxmlsec-mscrypto%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst xmlsec1-nss:xmlsec1-nss%,xmlsec1-nss:libxmlsec-nss%,$(gb_Library_FILENAMES)) endif # ifeq ($(COM),GCC) |