diff options
-rw-r--r-- | Repository.mk | 55 | ||||
-rw-r--r-- | RepositoryExternal.mk | 147 | ||||
-rw-r--r-- | RepositoryFixes.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/ExternalProject.mk | 5 | ||||
-rw-r--r-- | solenv/gbuild/Helper.mk | 18 | ||||
-rw-r--r-- | solenv/gbuild/LinkTarget.mk | 5 | ||||
-rw-r--r-- | solenv/gbuild/StaticLibrary.mk | 8 | ||||
-rw-r--r-- | solenv/gbuild/TargetLocations.mk | 10 | ||||
-rw-r--r-- | solenv/gbuild/platform/IOS_ARM_GCC.mk | 11 | ||||
-rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 10 | ||||
-rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 6 | ||||
-rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 8 | ||||
-rw-r--r-- | solenv/gbuild/platform/macosx.mk | 11 | ||||
-rw-r--r-- | solenv/gbuild/platform/solaris.mk | 12 | ||||
-rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 11 |
15 files changed, 15 insertions, 305 deletions
diff --git a/Repository.mk b/Repository.mk index b919371e214a..73456b9ab0ff 100644 --- a/Repository.mk +++ b/Repository.mk @@ -127,13 +127,6 @@ $(eval $(call gb_Helper_register_executables,OOO,\ unopkgio \ )) -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - directxcanvas \ - winextendloaderenv \ - winlauncher \ - wrapper \ -)) - else $(eval $(call gb_Helper_register_executables,OOO,\ @@ -672,49 +665,6 @@ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \ passive_native \ )) -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - $(if $(filter $(OS),ANDROID), \ - basebmp \ - ) \ - basegfx_s \ - codemaker \ - codemaker_cpp \ - codemaker_java \ - dtobj \ - findsofficepath \ - gnu_getopt \ - gnu_readdir_r \ - headless \ - libeay32 \ - npsoenv \ - nputils \ - pdfimport_s \ - plugcon \ - quickstarter \ - seterror \ - ssleay32 \ - ooopathutils \ - sample \ - sax_shared \ - simplemapi \ - shell_xmlparser \ - shell_xmlparser_x64 \ - shlxthandler_common \ - shlxthandler_common_x64 \ - salcpprt \ - testtools_bridgetest_s \ - transex \ - ulingu \ - vclmain \ - writerperfect \ - $(if $(filter-out $(OS),IOS), \ - registry_helper \ - ) \ - $(if $(filter $(OS),IOS), \ - uno \ - ) \ -)) - ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ xmlsec1 \ @@ -725,11 +675,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ xmlsec1-mscrypto \ )) endif -else -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - xmlsec1 \ - xmlsec1-nss \ -)) endif $(eval $(call gb_Helper_register_jars,URE, \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 3bb68e016907..777369ddbbee 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -43,10 +43,6 @@ gb_ExternalProject__use_mariadb := else # !SYSTEM_MARIADB -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - mariadblib \ -)) - define gb_LinkTarget__use_mariadb $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ @@ -306,11 +302,6 @@ gb_ExternalProject__use_zlib := else # !SYSTEM_ZLIB -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - zlib \ - zlib_x64 \ -)) - define gb_LinkTarget__use_zlib_multiarch $(if $(2),,$(call gb_Output_error,gb_LinkTarget__use_zlib_multiarch needs two arguments)) @@ -355,10 +346,6 @@ endef else # !SYSTEM_JPEG -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - jpeg \ -)) - define gb_LinkTarget__use_jpeg $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,jpeg) \ @@ -386,10 +373,6 @@ endef else # !SYSTEM_MYTHES -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - mythes \ -)) - define gb_LinkTarget__use_mythes $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,mythes) \ @@ -424,11 +407,6 @@ gb_ExternalProject__use_expat := else # !SYSTEM_EXPAT -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - expat \ - expat_x64 \ -)) - define gb_LinkTarget__use_expat_impl $(if $(2),,$(error gb_LinkTarget__use_expat_impl needs additional parameter)) @@ -469,10 +447,6 @@ endef else # !SYSTEM_HYPH -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - hyphen \ -)) - define gb_LinkTarget__use_hyphen $(call gb_LinkTarget_use_unpacked,$(1),hyphen) $(call gb_LinkTarget_set_include,$(1),\ @@ -500,10 +474,6 @@ endef else # !SYSTEM_HUNSPELL -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - hunspell \ -)) - define gb_LinkTarget__use_hunspell $(call gb_LinkTarget_add_defs,$(1),\ -DHUNSPELL_STATIC \ @@ -570,16 +540,7 @@ gb_ExternalProject__use_boost_headers:= else # !SYSTEM_BOOST -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - boostdatetime \ - boostsystem \ -)) - ifeq ($(OS),WNT) -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - boostthread \ -)) - define gb_LinkTarget__use_boostthread $(call gb_LinkTarget_add_defs,$(1),\ -DBOOST_ALL_NO_LIB \ @@ -589,8 +550,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ boostthread \ ) endef - -endif # WNT +endif define gb_LinkTarget__use_boostdatetime $(call gb_LinkTarget_add_defs,$(1),\ @@ -647,10 +607,6 @@ endef else # !SYSTEM_CMIS -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - cmislib \ -)) - define gb_LinkTarget__use_cmis $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,cmis)/src \ @@ -696,10 +652,6 @@ endef else # !SYSTEM_LIBEXTTEXTCAT -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ - exttextcat \ -)) - define gb_LinkTarget__use_libexttextcat $(call gb_LinkTarget_use_static_libraries,$(1),\ exttextcat \ @@ -830,10 +782,6 @@ endef else # !SYSTEM_LIBLANGTAG -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - langtag \ -)) - define gb_LinkTarget__use_liblangtag $(call gb_LinkTarget_use_unpacked,$(1),langtag) $(call gb_LinkTarget_set_include,$(1),\ @@ -955,12 +903,6 @@ endef else # ANDROID -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - rdf \ - rasqal \ - raptor2 \ -)) - define gb_LinkTarget__use_librdf $(call gb_LinkTarget_use_packages,$(1),raptor rasqal redland) $(call gb_LinkTarget_use_static_libraries,$(1),\ @@ -1035,10 +977,6 @@ endef else # ! SYSTEM_FREETYPE -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ - freetype \ -)) - define gb_LinkTarget__use_freetype_headers $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,freetype)/include \ @@ -1069,10 +1007,6 @@ endef else # ! SYSTEM_FONTCONFIG -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ - fontconfig \ -)) - define gb_LinkTarget__use_fontconfig $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,fontconfig) \ @@ -1098,9 +1032,6 @@ endef else ifeq ($(SYSTEM_GRAPHITE),NO) -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - graphite \ -)) define gb_LinkTarget__use_graphite $(call gb_LinkTarget_use_unpacked,$(1),graphite) $(call gb_LinkTarget_set_include,$(1),\ @@ -1256,9 +1187,6 @@ endef else # SYSTEM_HARFBUZZ != YES -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - harfbuzz \ -)) define gb_LinkTarget__use_harfbuzz $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,harfbuzz)/src \ @@ -1309,11 +1237,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ crypto \ ssl \ )) -else -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - crypto \ - ssl \ -)) endif define gb_ExternalProject__use_openssl @@ -1402,10 +1325,6 @@ endef else # !SYSTEM_CDR -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - cdr-0.0 \ -)) - define gb_LinkTarget__use_cdr $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,libcdr)/inc \ @@ -1436,10 +1355,6 @@ endef else # !SYSTEM_ODFGEN -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - odfgen-0.0 \ -)) - define gb_LinkTarget__use_odfgen $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,libodfgen)/inc \ @@ -1470,10 +1385,6 @@ endef else # !SYSTEM_MSPUB -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - mspub-0.0 \ -)) - define gb_LinkTarget__use_mspub $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,libmspub)/inc \ @@ -1504,10 +1415,6 @@ endef else # !SYSTEM_VISIO -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - visio-0.0 \ -)) - define gb_LinkTarget__use_visio $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,libvisio)/inc \ @@ -1539,10 +1446,6 @@ gb_ExternalProject__use_wpd := else # !SYSTEM_WPD -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - wpd-0.9 \ -)) - define gb_LinkTarget__use_wpd $(call gb_LinkTarget_set_include,$(1),\ $(WPD_CFLAGS) \ @@ -1578,10 +1481,6 @@ gb_ExternalProject__use_wpg := else # !SYSTEM_WPG -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - wpg-0.2 \ -)) - define gb_LinkTarget__use_wpg $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,libwpg)/inc \ @@ -1617,10 +1516,6 @@ gb_ExternalProject__use_wps := else # !SYSTEM_WPS -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - wps-0.2 \ -)) - define gb_LinkTarget__use_wps $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,libwps)/inc \ @@ -1655,10 +1550,6 @@ endef else # !SYSTEM_MWAW -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - mwaw-0.1 \ -)) - define gb_LinkTarget__use_mwaw $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,libmwaw)/inc \ @@ -1698,10 +1589,6 @@ endef ifeq ($(OS),ANDROID) -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - lcms2 \ -)) - define gb_LinkTarget__use_lcms2 $(call gb_LinkTarget_use_package,$(1),lcms2) $(call gb_LinkTarget_set_include,$(1),\ @@ -1934,10 +1821,6 @@ endef else # !SYSTEM_LIBPNG -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ - png \ -)) - define gb_LinkTarget__use_png $(call gb_LinkTarget_set_include,$(1),\ $(LIBPNG_CFLAGS) \ @@ -2026,12 +1909,6 @@ endef else # !SYSTEM_POPPLER -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ - fofi \ - Goo \ - xpdf \ -)) - define gb_LinkTarget__use_poppler $(call gb_LinkTarget_use_package,$(1),xpdf) @@ -2148,11 +2025,6 @@ endef else ifeq ($(SYSTEM_OPENLDAP),NO) -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ - ldap \ - lber \ -)) - define gb_LinkTarget__use_openldap $(call gb_LinkTarget_use_unpacked,$(1),openldap) $(call gb_LinkTarget_set_include,$(1),\ @@ -2223,10 +2095,6 @@ endif endef -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ - $(if $(filter MSC,$(COM)),lib)pq \ -)) - endif # SYSTEM_POSTGRESQL ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) @@ -2300,11 +2168,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\ xpcom_core \ )) -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ - embed_base_s \ - mozreg_s \ -)) - endif # DESKTOP ifeq ($(ENABLE_KDE),TRUE) @@ -2505,14 +2368,6 @@ endef else # !SYSTEM_LIBORCUS -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ - orcus \ -)) - -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ - orcus-parser \ -)) - define gb_LinkTarget__use_orcus $(call gb_LinkTarget_use_unpacked,$(1),liborcus) $(call gb_LinkTarget_set_include,$(1),\ diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 4a0f99c5c1b0..04cda5dc870c 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -55,9 +55,6 @@ gb_Library_DLLFILENAMES := $(patsubst rdf:rdf%,rdf:librdf%,$(gb_Library_DLLFILEN # libpyuno_wrapper.dll => pyuno.pyd gb_Library_DLLFILENAMES := $(patsubst pyuno:pyuno.dll,pyuno:pyuno$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd,$(gb_Library_DLLFILENAMES)) -gb_StaticLibrary_FILENAMES := $(patsubst png:png%,png:libpng%,$(gb_StaticLibrary_FILENAMES)) -gb_StaticLibrary_FILENAMES := $(patsubst salcpprt:salcpprt%,salcpprt:cpprtl%,$(gb_StaticLibrary_FILENAMES)) - ifeq ($(COM),GCC) gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst exslt:iexslt%,exslt:libexslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk index 1749e9ac4d74..cd61cd5cf602 100644 --- a/solenv/gbuild/ExternalProject.mk +++ b/solenv/gbuild/ExternalProject.mk @@ -159,11 +159,6 @@ endef # # gb_ExternalProject_use_static_libraries external staticlibraries define gb_ExternalProject_use_static_libraries -ifneq (,$$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2))) -$$(eval $$(call gb_Output_info, currently known static libraries are: $(sort $(gb_StaticLibrary_KNOWNLIBS)),ALL)) -$$(eval $$(call gb_Output_error,Cannot link against static library/libraries $$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2)). Static libraries must be registered in Repository.mk)) -endif - $(call gb_ExternalProject_get_preparation_target,$(1)) : \ $(foreach lib,$(2),$(call gb_StaticLibrary_get_target,$(lib))) diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index c98ea22bd95d..d6af98003e04 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -110,19 +110,16 @@ define gb_Helper_init_registries gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS gb_Library_VALIDINSTALLMODULES := BASE ONLINEUPDATE GRAPHICFILTER GNOME TDE IMPRESS KDE MATH OOO URE WRITER -gb_StaticLibrary_VALIDGROUPS := PLAINLIBS gb_Jar_VALIDGROUPS := URE OOO OXT NONE $$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(eval gb_Executable_$$(group) :=)) $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(eval gb_Library_$$(group) :=)) -$$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(eval gb_StaticLibrary_$$(group) :=)) $$(foreach group,$$(gb_Jar_VALIDGROUPS),$$(eval gb_Jar_$$(group) :=)) endef define gb_Helper_collect_knownlibs gb_Library_KNOWNLIBS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group))) -gb_StaticLibrary_KNOWNLIBS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group))) gb_Executable_KNOWN := $$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(gb_Executable_$$(group))) gb_Jar_KNOWN := $$(foreach group,$$(gb_Jar_VALIDGROUPS),$$(gb_Jar_$$(group))) @@ -178,21 +175,6 @@ gb_Library_MODULE_$(2) += $(filter-out $(gb_MERGEDLIBS) $(gb_URELIBS),$(3)) endef -define gb_Helper_register_static_libraries -ifeq ($$(filter $(1),$$(gb_StaticLibrary_VALIDGROUPS)),) -$$(eval $$(call gb_Output_error,$(1) is not a valid group for static libraries. Valid groups are: $$(gb_StaticLibrary_VALIDGROUPS))) -endif -$(foreach group,$(gb_StaticLibrary_VALIDGROUPS),\ - $(foreach target,$(2),\ - $(if $(filter $(target),$(gb_StaticLibrary_$(group))),\ - $(call gb_Output_error,gb_Helper_register_static_libraries: already registered: $(target))))) -$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\ - $(call gb_Output_error,gb_Helper_register_static_libraries: contains duplicates: $(2))) - -gb_StaticLibrary_$(1) += $(2) - -endef - define gb_Helper_register_jars ifeq ($$(filter $(1),$$(gb_Jar_VALIDGROUPS)),) $$(eval $$(call gb_Output_error,$(1) is not a valid group for jars. Valid groups are: $$(gb_Jar_VALIDGROUPS))) diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index dae37080de16..418b43f26e7a 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -907,11 +907,6 @@ endef # for a StaticLibrary, dependent libraries are not actually linked in define gb_LinkTarget_use_static_libraries -ifneq (,$$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2))) -$$(eval $$(call gb_Output_info, currently known static libraries are: $(sort $(gb_StaticLibrary_KNOWNLIBS)),ALL)) -$$(eval $$(call gb_Output_error,Cannot link against static library/libraries $$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2)). Static libraries must be registered in Repository.mk)) -endif - $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $$(if $$(filter-out StaticLibrary,$$(TARGETTYPE)),$(2)) $(call gb_LinkTarget_get_target,$(1)) : $(foreach lib,$(2),$(call gb_StaticLibrary_get_target,$(lib))) diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index 6aec948aeb65..e25328b94b19 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -23,7 +23,9 @@ # defined globally in gbuild.mk # gb_StaticLibrary_OUTDIRLOCATION := $(OUTDIR)/lib # defined by platform -# gb_StaticLibrary_FILENAMES +# gb_StaticLibrary_get_filename +# gb_StaticLibrary_PLAINEXT +# gb_StaticLibrary_StaticLibrary_platform # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows @@ -34,10 +36,6 @@ $(WORKDIR)/Clean/OutDir/lib/%$(gb_StaticLibrary_PLAINEXT) : $(AUXTARGETS)) define gb_StaticLibrary_StaticLibrary -ifeq (,$$(findstring $(1),$$(gb_StaticLibrary_KNOWNLIBS))) -$$(eval $$(call gb_Output_info,Currently known static libraries are: $(sort $(gb_StaticLibrary_KNOWNLIBS)),ALL)) -$$(eval $$(call gb_Output_error,Static library $(1) must be registered in Repository.mk)) -endif $(call gb_StaticLibrary__StaticLibrary_impl,$(1),$(call gb_StaticLibrary_get_linktargetname,$(1))) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 7a0b2b86055c..1bcc4dbc9c36 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -57,7 +57,7 @@ $(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(1):%,$(gb_Library_FI endef define gb_StaticLibrary_get_target -$(patsubst $(1):%,$(gb_StaticLibrary_OUTDIRLOCATION)/%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES))) +$(gb_StaticLibrary_OUTDIRLOCATION)/$(call gb_StaticLibrary_get_filename,$(1)) endef @@ -235,11 +235,11 @@ $(patsubst $(1):%,$(WORKDIR)/Headers/Library/%,$(filter $(1):%,$(gb_Library_FILE endef define gb_StaticLibrary_get_external_headers_target -$(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/StaticLibrary/%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES))) +$(WORKDIR)/ExternalHeaders/StaticLibrary/$(call gb_StaticLibrary_get_filename,$(1)) endef define gb_StaticLibrary_get_headers_target -$(patsubst $(1):%,$(WORKDIR)/Headers/StaticLibrary/%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES))) +$(WORKDIR)/Headers/StaticLibrary/$(call gb_StaticLibrary_get_filename,$(1)) endef $(eval $(call gb_Helper_make_clean_targets,\ @@ -363,10 +363,6 @@ define gb_Library_get_filename $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_FILENAMES))) endef -define gb_StaticLibrary_get_filename -$(patsubst $(1):%,%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES))) -endef - # Get dependencies needed for running the executable # # This is not strictly necessary, but it makes the use more similar to diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 46d73fd518ff..bd7380174685 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -189,17 +189,6 @@ $(call gb_LinkTarget_get_target,$(2)) : LAYER := $(call gb_Library_get_layer,$(1 endef -# StaticLibrary class - -gb_StaticLibrary_SYSPRE := lib -gb_StaticLibrary_PLAINEXT := .a - -gb_StaticLibrary_FILENAMES := \ - $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \ - -gb_StaticLibrary_StaticLibrary_platform = - - # Executable class gb_Executable_EXT := diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 7dde27153906..5b28abf7b39c 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -288,16 +288,6 @@ define gb_Library_get_dllname $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES))) endef -# StaticLibrary class - -gb_StaticLibrary_SYSPRE := lib -gb_StaticLibrary_PLAINEXT := .a - -gb_StaticLibrary_FILENAMES := \ - $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \ - -gb_StaticLibrary_StaticLibrary_platform = - # Executable class gb_Executable_EXT := .exe diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 37e2b7bd11e8..54647153a2fe 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -264,4 +264,10 @@ endif gb_ExternalProject_use_autoconf := +# StaticLibrary class + +gb_StaticLibrary_get_filename = lib$(1).a +gb_StaticLibrary_PLAINEXT := .a +gb_StaticLibrary_StaticLibrary_platform := + # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index c08349d83c33..841416e580d0 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -191,7 +191,7 @@ $(call gb_Helper_abbreviate_dirs,\ unset INCLUDE && \ $(if $(filter YES,$(LIBRARY_X64)), $(LINK_X64_BINARY), $(gb_LINK)) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ - $(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \ + $(if $(filter StaticLibrary,$(TARGETTYPE)),-LIB) \ $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ $(if $(filter YES,$(LIBRARY_X64)),,$(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS$(MSC_SUBSYSTEM_VERSION), -SUBSYSTEM:CONSOLE$(MSC_SUBSYSTEM_VERSION))) \ $(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64) \ @@ -371,13 +371,9 @@ endef # StaticLibrary class -gb_StaticLibrary_TARGETTYPEFLAGS := -LIB -gb_StaticLibrary_SYSPRE := +gb_StaticLibrary_get_filename = $(1).lib gb_StaticLibrary_PLAINEXT := .lib -gb_StaticLibrary_FILENAMES := \ - $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \ - define gb_StaticLibrary_StaticLibrary_platform $(call gb_LinkTarget_get_target,$(2)) \ $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2)) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index a12644e5205c..f7ecb7198e58 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -253,17 +253,6 @@ $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) : \ RPATH := endef -# StaticLibrary class - -gb_StaticLibrary_SYSPRE := lib -gb_StaticLibrary_PLAINEXT := .a - -gb_StaticLibrary_FILENAMES := \ - $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \ - -gb_StaticLibrary_StaticLibrary_platform = - - # Executable class gb_Executable_EXT := diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 2c0a836a48cb..5dfb5ac77909 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -278,18 +278,6 @@ endef gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script) - -# StaticLibrary class - -gb_StaticLibrary_SYSPRE := lib -gb_StaticLibrary_PLAINEXT := .a - -gb_StaticLibrary_FILENAMES := \ - $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \ - -gb_StaticLibrary_StaticLibrary_platform = - - # Executable class gb_Executable_EXT := diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index c15f0fa4a671..9b017ba087ce 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -279,17 +279,6 @@ endef gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script) -# StaticLibrary class - -gb_StaticLibrary_SYSPRE := lib -gb_StaticLibrary_PLAINEXT := .a - -gb_StaticLibrary_FILENAMES := \ - $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \ - -gb_StaticLibrary_StaticLibrary_platform = - - # Executable class gb_Executable_EXT := |