targets must be postextension SRCDIR is empty otherwise

3 files changed, 28 insertions, 61 deletions

diff --git a/solenv/gbuild/extensions/pre_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
index fff1c10067a7..fff1c10067a7 100644
--- a/solenv/gbuild/extensions/pre_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 6c62649636f8..1fa6a2b2ecf7 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -42,7 +42,34 @@ unitcheck: dev-install
 	@$(MAKE) -f $(realpath $(firstword $(MAKEFILE_LIST))) $@ gb_PARTIALBUILD=
 
 all:
-	
+
+ifeq ($(filter-out build,$(MAKECMDGOALS)),)
+gb_MAKETARGET=build
+else
+gb_MAKETARGET=all
+endif
+
+define gb_BuildplTarget_command
+cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl --all gb_MAKETARGET=$(gb_MAKETARGET)
+endef
+
+.PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install all build
+
+smoketestoo_native: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
+	$(call gb_BuildplTarget_command,$@)
+
+instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
+	$(call gb_BuildplTarget_command,$@)
+
+cross-build-toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
+	$(call gb_BuildplTarget_command,$@)
+
+dev-install: smoketestoo_native
+
+all: instsetoo_native
+
+build: instsetoo_native
+
 endif # gb_PARTIALBUILD
     
 # vim:set shiftwidth=4 softtabstop=4 noexpandtab:
diff --git a/solenv/gbuild/extensions/pre_BuildplTargets.mk b/solenv/gbuild/extensions/pre_BuildplTargets.mk
deleted file mode 100644
index cbe36e362a5d..000000000000
--- a/solenv/gbuild/extensions/pre_BuildplTargets.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#   -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#  
-#   Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#  
-#   The contents of this file are subject to the Mozilla Public License Version
-#   1.1 (the "License"); you may not use this file except in compliance with
-#   the License or as specified alternatively below. You may obtain a copy of
-#   the License at http://www.mozilla.org/MPL/
-#  
-#   Software distributed under the License is distributed on an "AS IS" basis,
-#   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#   for the specific language governing rights and limitations under the
-#   License.
-#  
-#   Major Contributor(s):
-#   [ Copyright (C) 2011 Bjoern Michaelsen <bjoern.michaelsen@canonical.com> (initial developer) ]
-#  
-#   All Rights Reserved.
-#  
-#   For minor contributions see the git repository.
-#  
-#   Alternatively, the contents of this file may be used under the terms of
-#   either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-#   the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-#   in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-#   instead of those above.
-
-ifeq ($(strip $(gb_PARTIALBUILD)),)
-
-ifeq ($(filter-out build,$(MAKECMDSEQUENCE)),)
-gb_MAKETARGET=build
-else
-gb_MAKETARGET=all
-endif
-
-define gb_BuildplTarget_command
-cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl --all gb_MAKETARGET=$(gb_MAKETARGET)
-endef
-
-.PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install all build
-
-smoketestoo_native: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
-	$(call gb_BuildplTarget_command,$@)
-
-instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
-	$(call gb_BuildplTarget_command,$@)
-
-cross-build-toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
-	$(call gb_BuildplTarget_command,$@)
-
-dev-install: smoketestoo_native
-
-all: instsetoo_native
-
-build: instsetoo_native
-
-endif # gb_PARTIALBUILD
-    
-# vim:set shiftwidth=4 softtabstop=4 noexpandtab:
-