diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-29 19:21:05 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-29 19:53:11 +0200 |
| commit | 7cafe7ee9c0fe52c2b93fde59b35475a5b208f0b (patch) | |
| tree | 698c91ff9aded0c20511e923150fb30685b03c81 /solenv | |
| parent | 5753241d8869e7a3f64c535e4d23f125a7aed683 (diff) | |
vertical space savings
Change-Id: I8f73a804e2005108f4a47d9fe4f9cd4425787cb1
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Helper.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 83 |
2 files changed, 28 insertions, 59 deletions
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 9817ef2923eb..e1e5119b07ce 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -176,6 +176,10 @@ gb_Jar_$(1) += $(2) endef +define gb_Helper_define_if_set +$(foreach def,$(1),$(if $(filter TRUE YES,$($(def))),-D$(def))) +endef + define gb_Helper_execute $(gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1) endef diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 395c9669f808..b50faa02f5f7 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -245,12 +245,10 @@ gb_GLOBALDEFS := \ ifeq ($(gb_PRODUCT),$(false)) -gb_GLOBALDEFS += \ - -DDBG_UTIL \ +gb_GLOBALDEFS += -DDBG_UTIL \ ifneq ($(COM),MSC) -gb_GLOBALDEFS += \ - -D_DEBUG \ +gb_GLOBALDEFS += -D_DEBUG \ endif endif @@ -260,80 +258,47 @@ gb_GLOBALDEFS += -DSOLAR_JAVA endif ifeq ($(gb_TIMELOG),1) -gb_GLOBALDEFS += \ - -DTIMELOG \ +gb_GLOBALDEFS += -DTIMELOG \ endif ifeq ($(gb_DEBUGLEVEL),0) -gb_GLOBALDEFS += \ - -DOPTIMIZE \ +gb_GLOBALDEFS += -DOPTIMIZE \ ifeq ($(strip $(ASSERT_ALWAYS_ABORT)),FALSE) -gb_GLOBALDEFS += \ - -DNDEBUG \ +gb_GLOBALDEFS += -DNDEBUG \ endif else -gb_GLOBALDEFS += \ - -DSAL_LOG_INFO \ - -DSAL_LOG_WARN \ +gb_GLOBALDEFS += -DSAL_LOG_INFO \ + -DSAL_LOG_WARN \ ifneq ($(gb_DEBUGLEVEL),1) # 2 or more -gb_GLOBALDEFS += \ - -DDEBUG \ - -endif -endif - -ifneq ($(strip $(ENABLE_GTK)),) -gb_GLOBALDEFS += -DENABLE_GTK -endif - -ifneq ($(strip $(ENABLE_TDE)),) -gb_GLOBALDEFS += -DENABLE_TDE -endif +gb_GLOBALDEFS += -DDEBUG \ -ifneq ($(strip $(ENABLE_KDE)),) -gb_GLOBALDEFS += -DENABLE_KDE endif - -ifneq ($(strip $(ENABLE_KDE4)),) -gb_GLOBALDEFS += -DENABLE_KDE4 -endif - -ifeq ($(strip $(ENABLE_GRAPHITE)),TRUE) -gb_GLOBALDEFS += -DENABLE_GRAPHITE -endif - -ifeq ($(strip $(ENABLE_HEADLESS)),TRUE) -gb_GLOBALDEFS += -DLIBO_HEADLESS -endif - -ifeq ($(strip $(DISABLE_DBCONNECTIVITY)),TRUE) -gb_GLOBALDEFS += -DDISABLE_DBCONNECTIVITY endif -ifeq ($(strip $(DISABLE_EXTENSIONS)),TRUE) -gb_GLOBALDEFS += -DDISABLE_EXTENSIONS -endif - -ifeq ($(strip $(DISABLE_SCRIPTING)),TRUE) -gb_GLOBALDEFS += -DDISABLE_SCRIPTING -endif +ifeq ($(ENABLE_HEADLESS),TRUE) +gb_GLOBALDEFS += -DLIBO_HEADLESS \ -ifeq ($(strip $(DISABLE_DYNLOADING)),TRUE) -gb_GLOBALDEFS += -DDISABLE_DYNLOADING endif -ifeq ($(HAVE_THREADSAFE_STATICS),TRUE) -gb_GLOBALDEFS += -DHAVE_THREADSAFE_STATICS -endif - -ifeq ($(ENABLE_TELEPATHY),TRUE) -gb_GLOBALDEFS += -DENABLE_TELEPATHY -endif +gb_GLOBALDEFS += \ + $(call gb_Helper_define_if_set,\ + DISABLE_DBCONNECTIVITY \ + DISABLE_DYNLOADING \ + DISABLE_EXTENSIONS \ + DISABLE_SCRIPTING \ + ENABLE_GRAPHITE \ + ENABLE_GTK \ + ENABLE_KDE \ + ENABLE_KDE4 \ + ENABLE_TDE \ + ENABLE_TELEPATHY \ + HAVE_THREADSAFE_STATICS \ + ) gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) |