Makefile.top | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-)
New commits: commit fdbb10a0e3f1e36cc28ea5547e08e6ad4b5de526 Author: Bjoern Michaelsen <[email protected]> Date: Thu Nov 29 13:34:24 2012 +0100 simplify diff --git a/Makefile.top b/Makefile.top index 2a5a3ce..559b300 100644 --- a/Makefile.top +++ b/Makefile.top @@ -57,14 +57,8 @@ $(1).all: bootstrap fetch ) \ $(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM) -$(1).build: - cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) build gb_PARTIALBUILD=T - -$(1).check: - cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) check gb_PARTIALBUILD=T - -$(1).clean: - cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) clean gb_PARTIALBUILD=T +$(1).build $(1).check $(1).clean: + cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@) gb_PARTIALBUILD=T $(1).subsequentcheck: cd $(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) subsequentcheck gb_PARTIALBUILD=T @@ -385,13 +379,7 @@ check: dev-install subsequentcheck subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install) $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@ -unitcheck: - $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@ - -slowcheck: - $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@ - -debugrun: +unitcheck slowcheck debugrun: $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@ endif # not clean or distclean _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
