summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/CustomTarget_bridge.mk2
-rw-r--r--accessibility/CustomTarget_bridge_inc.mk2
-rw-r--r--clucene/CustomTarget_source.mk2
-rw-r--r--desktop/CustomTarget_soffice.mk2
-rw-r--r--extensions/CustomTarget_so_activex_idl.mk2
-rw-r--r--extensions/CustomTarget_so_activex_x64.mk2
-rw-r--r--filter/CustomTarget_svg.mk2
-rw-r--r--i18npool/CustomTarget_breakiterator.mk2
-rw-r--r--i18npool/CustomTarget_collator.mk2
-rw-r--r--i18npool/CustomTarget_indexentry.mk2
-rw-r--r--i18npool/CustomTarget_localedata.mk2
-rw-r--r--i18npool/CustomTarget_textconversion.mk2
-rw-r--r--jurt/CustomTarget_jnilib.mk2
-rw-r--r--jurt/CustomTarget_test_urp.mk2
-rw-r--r--jvmfwk/CustomTarget_jreproperties.mk2
-rw-r--r--officecfg/CustomTarget_registry.mk2
-rw-r--r--packimages/CustomTarget_images.mk2
-rw-r--r--ridljar/CustomTarget_javamaker.mk2
-rw-r--r--sal/CustomTarget_generated.mk2
-rw-r--r--sdext/CustomTarget_pdfimport.mk2
-rw-r--r--sdext/CustomTarget_presenter.mk2
-rw-r--r--solenv/gbuild/CustomTarget.mk51
-rw-r--r--solenv/gbuild/Package.mk7
-rw-r--r--solenv/gbuild/gbuild.mk1
-rw-r--r--solenv/gbuild/gbuild_simple.mk109
-rw-r--r--tools/CustomTarget_reversemap.mk2
-rw-r--r--unoil/CustomTarget_climaker.mk2
-rw-r--r--unoil/CustomTarget_javamaker.mk2
-rw-r--r--vcl/CustomTarget_afm_hash.mk2
-rw-r--r--vcl/CustomTarget_kde4_moc.mk2
-rw-r--r--vcl/CustomTarget_kde_moc.mk2
-rw-r--r--writerfilter/CustomTarget_source.mk2
32 files changed, 32 insertions, 192 deletions
diff --git a/accessibility/CustomTarget_bridge.mk b/accessibility/CustomTarget_bridge.mk
index bc58988d8027..1d26e845050c 100644
--- a/accessibility/CustomTarget_bridge.mk
+++ b/accessibility/CustomTarget_bridge.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,accessibility/bridge,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,accessibility/bridge))
ACBR := $(call gb_CustomTarget_get_workdir,accessibility/bridge)
diff --git a/accessibility/CustomTarget_bridge_inc.mk b/accessibility/CustomTarget_bridge_inc.mk
index d64b19bec626..b6411473b6f4 100644
--- a/accessibility/CustomTarget_bridge_inc.mk
+++ b/accessibility/CustomTarget_bridge_inc.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,accessibility/bridge/inc,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,accessibility/bridge/inc))
ACBI := $(call gb_CustomTarget_get_workdir,accessibility/bridge/inc)
diff --git a/clucene/CustomTarget_source.mk b/clucene/CustomTarget_source.mk
index c1d858649568..474d1b838a8e 100644
--- a/clucene/CustomTarget_source.mk
+++ b/clucene/CustomTarget_source.mk
@@ -26,7 +26,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,clucene/source,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,clucene/source))
CLSO := $(call gb_CustomTarget_get_workdir,clucene/source)
diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffice.mk
index 5e12856db345..8d49935f6a38 100644
--- a/desktop/CustomTarget_soffice.mk
+++ b/desktop/CustomTarget_soffice.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,desktop/soffice,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,desktop/soffice))
DESO := $(call gb_CustomTarget_get_workdir,desktop/soffice)
diff --git a/extensions/CustomTarget_so_activex_idl.mk b/extensions/CustomTarget_so_activex_idl.mk
index 80d8089e44af..582b0315d458 100644
--- a/extensions/CustomTarget_so_activex_idl.mk
+++ b/extensions/CustomTarget_so_activex_idl.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,extensions/source/activex/idl,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,extensions/source/activex/idl))
EXAI := $(call gb_CustomTarget_get_workdir,extensions/source/activex/idl)
diff --git a/extensions/CustomTarget_so_activex_x64.mk b/extensions/CustomTarget_so_activex_x64.mk
index f894bac805ba..88b07b19d9e8 100644
--- a/extensions/CustomTarget_so_activex_x64.mk
+++ b/extensions/CustomTarget_so_activex_x64.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,extensions/source/activex,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,extensions/source/activex))
EXSA := $(call gb_CustomTarget_get_workdir,extensions/source/activex)
diff --git a/filter/CustomTarget_svg.mk b/filter/CustomTarget_svg.mk
index 29156a778bbb..d841dbd526e3 100644
--- a/filter/CustomTarget_svg.mk
+++ b/filter/CustomTarget_svg.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,filter/source/svg,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,filter/source/svg))
FISS := $(call gb_CustomTarget_get_workdir,filter/source/svg)
diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk
index a8379d746f56..4ba03d502a8f 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -26,7 +26,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,i18npool/breakiterator,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,i18npool/breakiterator))
IPBI := $(call gb_CustomTarget_get_workdir,i18npool/breakiterator)
diff --git a/i18npool/CustomTarget_collator.mk b/i18npool/CustomTarget_collator.mk
index 54a2d0c37137..9be28e05fbe7 100644
--- a/i18npool/CustomTarget_collator.mk
+++ b/i18npool/CustomTarget_collator.mk
@@ -26,7 +26,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,i18npool/collator,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,i18npool/collator))
IPCO := $(call gb_CustomTarget_get_workdir,i18npool/collator)
TXTLIST := $(notdir $(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt))
diff --git a/i18npool/CustomTarget_indexentry.mk b/i18npool/CustomTarget_indexentry.mk
index c28dbf1b99f9..681dd4c1e6e7 100644
--- a/i18npool/CustomTarget_indexentry.mk
+++ b/i18npool/CustomTarget_indexentry.mk
@@ -26,7 +26,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,i18npool/indexentry,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,i18npool/indexentry))
IPIE := $(call gb_CustomTarget_get_workdir,i18npool/indexentry)
diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk
index 48b611ec6432..c5d23588ace0 100644
--- a/i18npool/CustomTarget_localedata.mk
+++ b/i18npool/CustomTarget_localedata.mk
@@ -26,7 +26,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,i18npool/localedata,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,i18npool/localedata))
IPLD := $(call gb_CustomTarget_get_workdir,i18npool/localedata)
diff --git a/i18npool/CustomTarget_textconversion.mk b/i18npool/CustomTarget_textconversion.mk
index fa07733b4741..da58b1b33a54 100644
--- a/i18npool/CustomTarget_textconversion.mk
+++ b/i18npool/CustomTarget_textconversion.mk
@@ -26,7 +26,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,i18npool/textconversion,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,i18npool/textconversion))
IPTC := $(call gb_CustomTarget_get_workdir,i18npool/textconversion)
diff --git a/jurt/CustomTarget_jnilib.mk b/jurt/CustomTarget_jnilib.mk
index 71d90f67b987..5badfc286dc0 100644
--- a/jurt/CustomTarget_jnilib.mk
+++ b/jurt/CustomTarget_jnilib.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,jurt/util,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,jurt/util))
JUJL := $(call gb_CustomTarget_get_workdir,jurt/util)
diff --git a/jurt/CustomTarget_test_urp.mk b/jurt/CustomTarget_test_urp.mk
index 73f6faddeeec..f5c2f6b977fb 100644
--- a/jurt/CustomTarget_test_urp.mk
+++ b/jurt/CustomTarget_test_urp.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,jurt/test/com/sun/star/lib/uno/protocols/urp,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,jurt/test/com/sun/star/lib/uno/protocols/urp))
JUTU := $(call gb_CustomTarget_get_workdir,jurt/test/com/sun/star/lib/uno/protocols/urp)
diff --git a/jvmfwk/CustomTarget_jreproperties.mk b/jvmfwk/CustomTarget_jreproperties.mk
index 6b49d64396ac..ffeb5787ca9c 100644
--- a/jvmfwk/CustomTarget_jreproperties.mk
+++ b/jvmfwk/CustomTarget_jreproperties.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,jvmfwk/jreproperties,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,jvmfwk/jreproperties))
JFJP := $(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)
diff --git a/officecfg/CustomTarget_registry.mk b/officecfg/CustomTarget_registry.mk
index 8f5ea48e146d..7bf0ba77555e 100644
--- a/officecfg/CustomTarget_registry.mk
+++ b/officecfg/CustomTarget_registry.mk
@@ -29,7 +29,7 @@
OCDIR := $(SRCDIR)/officecfg/registry
include $(OCDIR)/files.mk
-$(eval $(call gb_CustomTarget_CustomTarget,officecfg/registry,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,officecfg/registry))
OCRG := $(call gb_CustomTarget_get_workdir,officecfg/registry)
diff --git a/packimages/CustomTarget_images.mk b/packimages/CustomTarget_images.mk
index d602137956bc..3e4efda5c289 100644
--- a/packimages/CustomTarget_images.mk
+++ b/packimages/CustomTarget_images.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,packimages/images,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,packimages/images))
PIIM := $(call gb_CustomTarget_get_workdir,packimages/images)
diff --git a/ridljar/CustomTarget_javamaker.mk b/ridljar/CustomTarget_javamaker.mk
index ef72abdc0166..31a7739f7645 100644
--- a/ridljar/CustomTarget_javamaker.mk
+++ b/ridljar/CustomTarget_javamaker.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,ridljar/javamaker,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,ridljar/javamaker))
RJJM := $(call gb_CustomTarget_get_workdir,ridljar/javamaker)
diff --git a/sal/CustomTarget_generated.mk b/sal/CustomTarget_generated.mk
index b968acc6478b..c0be5b6cb95b 100644
--- a/sal/CustomTarget_generated.mk
+++ b/sal/CustomTarget_generated.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,sal/generated,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,sal/generated))
SAUT := $(call gb_CustomTarget_get_workdir,sal/generated)
diff --git a/sdext/CustomTarget_pdfimport.mk b/sdext/CustomTarget_pdfimport.mk
index 3e57b3d7e5aa..c5fae4a3b93d 100644
--- a/sdext/CustomTarget_pdfimport.mk
+++ b/sdext/CustomTarget_pdfimport.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,sdext/pdfimport,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,sdext/pdfimport))
SEPI := $(call gb_CustomTarget_get_workdir,sdext/pdfimport)
diff --git a/sdext/CustomTarget_presenter.mk b/sdext/CustomTarget_presenter.mk
index fee465c5917a..5b6188107f14 100644
--- a/sdext/CustomTarget_presenter.mk
+++ b/sdext/CustomTarget_presenter.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,sdext/source/presenter/help/en-US/com.sun.PresenterScreen,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,sdext/source/presenter/help/en-US/com.sun.PresenterScreen))
SEPR := $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index c2456c0f5278..31c5e9caa456 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -26,66 +26,23 @@
#
#*************************************************************************
-# N.B.: putting the "+" there at the start activates the GNU make job server
-define gb_CustomTarget__command
-+$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
- O='$(OUTDIR)' S='$(SRCDIR)' W='$(WORKDIR)' gb_AWK='$(gb_AWK)' \
- gb_XSLTPROC='$(gb_XSLTPROC)' GBUILDDIR='$(GBUILDDIR)' SRCDIR='$(SRCDIR)' \
- $(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
- touch $(1))
-
-endef
-
# the .dir is for make 3.81, which ignores trailing /
$(call gb_CustomTarget_get_workdir,%)/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
$(call gb_CustomTarget_get_target,%) :
- $(call gb_Output_announce,$*,$(true),MAK,3)
- $(if $(NEW_STYLE),touch $@,\
- $(call gb_CustomTarget__command,$@,$*))
+ $(call gb_Output_announce,$*,$(true),CUS,3)
+ touch $@
.PHONY: $(call gb_CustomTarget_get_clean_target,%)
$(call gb_CustomTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),MAK,3)
+ $(call gb_Output_announce,$*,$(false),CUS,3)
$(call gb_Helper_abbreviate_dirs,\
rm -rf $(call gb_CustomTarget_get_workdir,$*) && \
rm -f $(call gb_CustomTarget_get_target,$*))
-define gb_CustomTarget__get_makefile
-$(SRCDIR)/$(1)/Makefile
-endef
-
define gb_CustomTarget_CustomTarget
-$(call gb_CustomTarget_get_target,$(1)) : NEW_STYLE := $(2)
-ifeq ($(2),)
-$(call gb_CustomTarget_get_target,$(1)) : \
- $(call gb_CustomTarget__get_makefile,$(1))
-else
-$$(eval $$(call gb_Module_register_target,$(call gb_CustomTarget_get_target,$(1)),$(call gb_CustomTarget_get_clean_target,$(1))))
-endif
-
-endef
-
-
-define gb_CustomTarget_add_dependency
-$(call gb_CustomTarget_get_target,$(1)) : $(SRCDIR)/$(2)
-
-endef
-
-define gb_CustomTarget_add_dependencies
-$(foreach dependency,$(2),$(call gb_CustomTarget_add_dependency,$(1),$(dependency)))
-
-endef
-
-define gb_CustomTarget_add_outdir_dependency
-$(call gb_CustomTarget_get_target,$(1)) : $(2)
-
-endef
-
-define gb_CustomTarget_add_outdir_dependencies
-$(foreach dependency,$(2),$(call gb_CustomTarget_add_outdir_dependency,$(1),$(dependency)))
+$(eval $(call gb_Module_register_target,$(call gb_CustomTarget_get_target,$(1)),$(call gb_CustomTarget_get_clean_target,$(1))))
endef
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 1a4bf52e39c9..62d82bd408a9 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -83,11 +83,4 @@ $(call gb_PackagePart_PackagePart,$(2),$$(gb_Package_SOURCEDIR_$(1))/$(3),$(call
endef
-define gb_Package_add_customtarget
-$(call gb_Package_get_preparation_target,$(1)) : $(call gb_CustomTarget_get_target,$(2))
-$(call gb_Package_get_clean_target,$(1)) : $(call gb_CustomTarget_get_clean_target,$(2))
-$(eval $(call gb_CustomTarget_CustomTarget,$(2)))
-
-endef
-
# vim: set noet sw=4:
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 45d3b4ad0b69..b12c88fd9c02 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -49,7 +49,6 @@ GBUILDDIR:=$(SRCDIR)/solenv/gbuild
.DELETE_ON_ERROR:
SHELL := /bin/sh
-MAKEFLAGS+=-r
true := T
false :=
define NEWLINE
diff --git a/solenv/gbuild/gbuild_simple.mk b/solenv/gbuild/gbuild_simple.mk
deleted file mode 100644
index 6ee9e09f4034..000000000000
--- a/solenv/gbuild/gbuild_simple.mk
+++ /dev/null
@@ -1,109 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-GBUILDDIR:=$(SRC_ROOT)/solenv/gbuild
-
-# this is a subset of gbuild functionality, for use in custom makefiles
-
-COMMA :=,
-
-include $(GBUILDDIR)/Output.mk
-
-# BuildDirs overrides *DIR variables for Windows
-include $(GBUILDDIR)/BuildDirs.mk
-
-# Presumably the common parts in gbuild.mk and gbuild_simple.mk should
-# be factored out into one file instead of duplicating, but... perhaps
-# wait until this stabilizes a bit and we know with more certainty
-# what is needed in both.
-
-# Or alternatively: Just mark these variables for export in gbuild.mk?
-# I think any use of gbuild_simple.mk is in a sub-make under one that
-# uses gbuild.mk anyway.
-
-ifneq ($(strip $(PRODUCT)$(product)),)
-gb_PRODUCT := $(true)
-else
-gb_PRODUCT := $(false)
-endif
-
-# These are useful, too, for stuff built in "custom" Makefiles
-ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)),)
-gb_SYMBOL := $(true)
-else
-gb_SYMBOL := $(false)
-endif
-
-gb_DEBUGLEVEL := 0
-ifneq ($(strip $(DEBUG)$(debug)),)
-gb_DEBUGLEVEL := 1
-endif
-
-ifneq ($(strip $(DBGLEVEL)$(dbglevel)),)
-ifneq ($(strip $(dbglevel)),)
-gb_DEBUGLEVEL := $(strip $(dbglevel))
-else
-gb_DEBUGLEVEL := $(strip $(DBGLEVEL))
-endif
-endif
-
-ifneq ($(gb_DEBUGLEVEL),0)
-gb_SYMBOL := $(true)
-endif
-
-include $(GBUILDDIR)/Helper.mk
-include $(GBUILDDIR)/Tempfile.mk
-
-# Include platform/cpu/compiler specific config/definitions
-include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk
-
-ifeq ($(CROSS_COMPILING),YES)
-# We can safely Assume all cross-compilation is from Unix systems.
-gb_Executable_EXT_for_build :=
-else
-gb_Executable_EXT_for_build := $(gb_Executable_EXT)
-endif
-
-ifeq ($(SYSTEM_PYTHON),YES)
-gb_PYTHONTARGET :=
-gb_PYTHON := $(PYTHON)
-else ifeq ($(OS),MACOSX)
-#fixme: remove this MACOSX ifeq branch by filling in gb_PYTHON_PRECOMMAND in
-#gbuild/platform/macosx.mk correctly for mac, e.g. PYTHONPATH and PYTHONHOME
-#dirs for in-tree internal python
-gb_PYTHONTARGET :=
-gb_PYTHON := $(PYTHON)
-else ifeq ($(DISABLE_PYTHON),TRUE)
-# Build-time python
-gb_PYTHON := python
-else
-gb_PYTHONTARGET := $(OUTDIR)/bin/python
-gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET)
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/tools/CustomTarget_reversemap.mk b/tools/CustomTarget_reversemap.mk
index c15dc0e2e8df..71efdc8d2103 100644
--- a/tools/CustomTarget_reversemap.mk
+++ b/tools/CustomTarget_reversemap.mk
@@ -23,7 +23,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,tools/reversemap,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,tools/reversemap))
TLRM := $(call gb_CustomTarget_get_workdir,tools/reversemap)
diff --git a/unoil/CustomTarget_climaker.mk b/unoil/CustomTarget_climaker.mk
index 0e529d00e494..78eda26c437e 100644
--- a/unoil/CustomTarget_climaker.mk
+++ b/unoil/CustomTarget_climaker.mk
@@ -27,7 +27,7 @@
include $(SRCDIR)/unoil/climaker/version.txt
-$(eval $(call gb_CustomTarget_CustomTarget,unoil/climaker,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,unoil/climaker))
UICM := $(call gb_CustomTarget_get_workdir,unoil/climaker)
diff --git a/unoil/CustomTarget_javamaker.mk b/unoil/CustomTarget_javamaker.mk
index 636a65dfdd6b..73fd4363868c 100644
--- a/unoil/CustomTarget_javamaker.mk
+++ b/unoil/CustomTarget_javamaker.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,unoil/javamaker,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,unoil/javamaker))
UIJM := $(call gb_CustomTarget_get_workdir,unoil/javamaker)
diff --git a/vcl/CustomTarget_afm_hash.mk b/vcl/CustomTarget_afm_hash.mk
index 57ec6cc8b426..23cc4ca20133 100644
--- a/vcl/CustomTarget_afm_hash.mk
+++ b/vcl/CustomTarget_afm_hash.mk
@@ -23,7 +23,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,vcl/generic/fontmanager,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,vcl/generic/fontmanager))
VCFM := $(call gb_CustomTarget_get_workdir,vcl/generic/fontmanager)
diff --git a/vcl/CustomTarget_kde4_moc.mk b/vcl/CustomTarget_kde4_moc.mk
index 5d0e4b5c63a0..bd887e582227 100644
--- a/vcl/CustomTarget_kde4_moc.mk
+++ b/vcl/CustomTarget_kde4_moc.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde4,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde4))
VCKM := $(call gb_CustomTarget_get_workdir,vcl/unx/kde4)
diff --git a/vcl/CustomTarget_kde_moc.mk b/vcl/CustomTarget_kde_moc.mk
index 7d54c0b0d307..85a65ea3fdf9 100644
--- a/vcl/CustomTarget_kde_moc.mk
+++ b/vcl/CustomTarget_kde_moc.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde/fpicker,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde/fpicker))
VCKF := $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)
diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk
index e0dda39b2e27..95fe26697c9a 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/writerfilter/CustomTarget_source.mk
@@ -27,7 +27,7 @@
#*************************************************************************
-$(eval $(call gb_CustomTarget_CustomTarget,writerfilter/source,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,writerfilter/source))
WFSG := $(call gb_CustomTarget_get_workdir,writerfilter/source)
WFDIR := $(SRCDIR)/writerfilter/source/