diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2013-05-30 14:39:38 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-07 15:14:28 +0200 |
commit | ddb5edc8a6dcbe309daf4ec7356601a7dfee1700 (patch) | |
tree | c57cda78445cd97d610859551648a935025a1d35 /solenv | |
parent | further reduce GUIBASE usage; don't set it to headless (diff) | |
download | core-ddb5edc8a6dcbe309daf4ec7356601a7dfee1700.tar.gz core-ddb5edc8a6dcbe309daf4ec7356601a7dfee1700.zip |
gbuild: do not register static libraries
It does not make sense, there was only one group anyway.
Change-Id: I606138ceed0bfc628b8a23abb864280d9626ed60
Diffstat (limited to 'solenv')
-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 |
12 files changed, 14 insertions, 101 deletions
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 := |