more targets moved to gbuild

3 files changed, 37 insertions, 6 deletions

diff --git a/solenv/gbuild/extensions/post_BuilplTargets.mk b/solenv/gbuild/extensions/post_BuilplTargets.mk
index b93774cbcc81..6c62649636f8 100644
--- a/solenv/gbuild/extensions/post_BuilplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuilplTargets.mk
@@ -28,10 +28,21 @@
 ifeq ($(strip $(gb_PARTIALBUILD)),)
 
 gb_Module_add_target=
+gb_Module_add_moduledir=
 gb_Module_add_check_target=
 gb_Module_add_subsequentcheck_target=
 gb_FULLDEPS=
 
+clean: clean-host clean-build
+
+subsequentcheck: dev-install
+	@$(MAKE) -f $(realpath $(firstword $(MAKEFILE_LIST))) $@ gb_PARTIALBUILD=
+
+unitcheck: dev-install
+	@$(MAKE) -f $(realpath $(firstword $(MAKEFILE_LIST))) $@ gb_PARTIALBUILD=
+
+all:
+	
 endif # gb_PARTIALBUILD
     
 # vim:set shiftwidth=4 softtabstop=4 noexpandtab:
diff --git a/solenv/gbuild/extensions/pre_AuxTargets.mk b/solenv/gbuild/extensions/pre_AuxTargets.mk
index 78f3bef964a8..fff1c10067a7 100644
--- a/solenv/gbuild/extensions/pre_AuxTargets.mk
+++ b/solenv/gbuild/extensions/pre_AuxTargets.mk
@@ -25,7 +25,7 @@
 #   in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 #   instead of those above.
 
-.PHONY: id tags docs distro-pack-install fetch
+.PHONY: id tags docs distro-pack-install fetch clean-host clean-build bootstrap
 
 id:
 	@create-ids
@@ -53,5 +53,25 @@ $(WORKDIR)/bootstrap:
 
 bootstrap: $(WORKDIR)/bootstrap
 
-# vim:set shiftwidth=4 softtabstop=4 noexpandtab:
+ifeq ($(strip $(gb_PARTIALBUILD)),)
+
+clean-host:
+	rm -rf $(SRCDIR)/*/$(INPATH)
+	rm -rf install
+
+clean-build:
+	if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake clean; fi
+	rm -f solenv/*/bin/dmake*
+	rm -rf $(SRCDIR)*/$(INPATH_FOR_BUILD)
+
+distclean: clean
+	if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake clean; fi
+	cd $(SRCDIR) && rm -rf Env.Host.sh Makefile aclocal.m4 autogen.lastrun autom4te.cache \
+	bin/repo-list build_env config.log config.status configure \
+	desktop/scripts/soffice.sh ooo.lst post_download post_download.log \
+	set_soenv set_soenv.last set_soenv.stamp src.downloaded warn
 
+endif
+
+
+# vim:set shiftwidth=4 softtabstop=4 noexpandtab:
diff --git a/solenv/gbuild/extensions/pre_BuildplTargets.mk b/solenv/gbuild/extensions/pre_BuildplTargets.mk
index 86abd2352b47..cbe36e362a5d 100644
--- a/solenv/gbuild/extensions/pre_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/pre_BuildplTargets.mk
@@ -39,17 +39,17 @@ endef
 
 .PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install all build
 
-smoketestoo_native:
+smoketestoo_native: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
 	$(call gb_BuildplTarget_command,$@)
 
-instsetoo_native:
+instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
 	$(call gb_BuildplTarget_command,$@)
 
-cross-build-toolset:
+cross-build-toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
 	$(call gb_BuildplTarget_command,$@)
 
 dev-install: smoketestoo_native
-	
+
 all: instsetoo_native
 
 build: instsetoo_native