summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-03-27 11:35:40 +0200
committerTor Lillqvist <tml@iki.fi>2013-03-27 11:36:03 +0200
commita8c3c673eaec987e9fe47123f60e5f9d34a4e93f (patch)
treeaddc0a07ffb5430f6a2c74e4cb599bd1f3de41dd /solenv
parent556fe2c6128a32233b411a85c54177e1d5be1e0d (diff)
Use <config_features.h> instead of -DLIBO_FEATURE_*
Change-Id: Idc198beb6d759dbe3bad6ea58d896c1555b4cc0f
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/Helper.mk4
-rw-r--r--solenv/gbuild/gbuild.mk3
2 files changed, 0 insertions, 7 deletions
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 0b32fc79a468..0a732c2270db 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -218,10 +218,6 @@ define gb_Helper_define_if_set
$(foreach def,$(1),$(if $(filter TRUE YES,$($(def))),-D$(def)))
endef
-define gb_Helper_define_if_in
-$(foreach def,$(1),$(if $(filter $(def),$(2)),-DLIBO_FEATURE_$(def)))
-endef
-
define gb_Helper_execute
$(call gb_Executable_get_command,$(firstword $(1))) $(wordlist 2,$(words $(1)),$(1))
endef
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index d026cd900364..5a4161e5abcb 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -277,9 +277,6 @@ gb_GLOBALDEFS += \
ENABLE_READONLY_INSTALLSET \
)
-gb_GLOBALDEFS += \
- $(call gb_Helper_define_if_in,DESKTOP HELP,$(BUILD_TYPE))
-
gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
include $(GBUILDDIR)/Deliver.mk