build userfriendly targets from toplevel

Change-Id: Iffbe6d4570bf4d4bdd7347260a6bb4160af24515

Makefile.in

@@ -84,13 +84,42 @@ endef
 
 $(eval $(call gbuild_modules_rules,$(filter-out Module%,$(subst /, ,$(subst $(SRCDIR)/,,$(wildcard $(SRCDIR)/*/Module_*.mk))))))
 
-# run a JunitTest - relies on naming convention (module prefix)
-$(WORKDIR)/JunitTest/%/done :
-	cd $(firstword $(subst _, ,$*)) && $(GNUMAKE) $(GMAKE_OPTIONS) $@
-
-# run a CppunitTest - relies on naming convention (module prefix)
-$(WORKDIR)/CppunitTest/%.test :
-	cd $(firstword $(subst _, ,$*)) && $(GNUMAKE) $(GMAKE_OPTIONS) $@
+gbuild_TARGETS := AllLangHelp \
+	AllLangResTarget \
+	AllLangZip \
+	AutoInstallLibs \
+	CliLibrary \
+	CliNativeLibrary \
+	CliUnoApiTarget \
+	Configuration \
+	CppunitTest \
+	CustomTarget \
+	Dictionary \
+	Executable \
+	Extension \
+	ExternalPackage \
+	ExternalProject \
+	InstallModule \
+	InstallScript \
+	InternalUnoApi \
+	Jar \
+	JunitTest \
+	Library \
+	Module \
+	Package \
+	Pagein \
+	Pyuno \
+	Rdb \
+	StaticLibrary \
+	UI \
+	UnoApi \
+	UnoApiMerge \
+	UnpackedTarball \
+	WinResTarget \
+	Zip
+# build a generic gbuild target
+$(foreach target,$(gbuild_TARGETS),$(target)_%):
+	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.build $@
 
 #
 # Clean

solenv/gbuild/Module.mk

@@ -164,6 +164,7 @@ gb_Module_SUBSEQUENTCHECKTARGETSTACK := $(call gb_Module_get_subsequentcheck_tar
 gb_Module_CLEANTARGETSTACK := $(call gb_Module_get_clean_target,$(1)) $(gb_Module_CLEANTARGETSTACK)
 gb_Module_CURRENTMODULE_DEBUG_ENABLED := $(call gb_Module__debug_enabled,$(1))
 gb_Module_CURRENTMODULE_NAME := $(1)
+$(call gb_Helper_make_userfriendly_targets,$(1),Module)
 
 endef