diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-06-04 16:11:19 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-06-09 17:05:50 +0200 |
| commit | 1817366cb5f61337b34b5284615d3d4e0a8aa68a (patch) | |
| tree | 03ac5b051b6367567c66c6aa6741d63ef9ff7ef1 /solenv | |
| parent | gbuild: partial_build.mk: avoid a problem with Win32 make (diff) | |
| download | core-1817366cb5f61337b34b5284615d3d4e0a8aa68a.tar.gz core-1817366cb5f61337b34b5284615d3d4e0a8aa68a.zip | |
gbuild: remove config_libraries.h and gb_Helper_generate_config_libraries
This much ugly complexity, generating a header on every gbuild startup
etc. is really not warranted for 6 callers of the generated macros.
Also, the Win32 make has problems with the quoting.
Change-Id: If945e09c1730e52174a6084677842dc611d66b2f
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Helper.mk | 9 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 2 |
2 files changed, 0 insertions, 11 deletions
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 8efba9834ba1..398b2f7f9a8c 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -208,15 +208,6 @@ else mv $(1) $(2) $(if $(3),&& touch -r $(3) $(2)); \ fi endef -define gb_Helper_generate_config_libraries -$(shell FILE=$(BUILDDIR)/config_$(gb_Side)/config_libraries.h && \ -printf "// This file is generated by gbuild: gb_Helper_generate_config_libraries.\n\n" >> $$FILE.tmp && \ -$(foreach lib,$(gb_Library_KNOWNLIBS), \ - printf "#define LIBO_LIB_$(subst -,_,$(lib)) \"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,$(lib)))\"\n" >> $$FILE.tmp &&) \ -printf "\n#define LIBO_LIBRARY(name) LIBO_LIB_##name\n" >> $$FILE.tmp && \ -$(call gb_Helper_replace_if_different_and_touch,$$FILE.tmp,$$FILE)) -endef - define gb_Helper_define_if_set $(foreach def,$(1),$(if $(filter TRUE YES,$($(def))),-D$(def))) endef diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 23d5591cfcb4..17a7d8fe0a50 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -325,8 +325,6 @@ include $(foreach class, \ $(eval $(call gb_Helper_process_executable_registrations)) $(eval $(call gb_Postprocess_make_targets)) -$(eval $(call gb_Helper_generate_config_libraries)) - # optional extensions that should never be essential ifneq ($(wildcard $(GBUILDDIR)/extensions/post_*.mk),) include $(wildcard $(GBUILDDIR)/extensions/post_*.mk) |