summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2013-03-05 17:03:04 +0100
committerMatúš Kukan <matus.kukan@gmail.com>2013-03-06 12:39:28 +0100
commit96409470b19d32a2310086b089542b333686f4da (patch)
treea9f5dd9446101c1f8f1c92d56a164ec4fea0d78b /Makefile.in
parent076eaea23c1c9992499399504c90fd00d83f1539 (diff)
reintroduce gb_PARTIAL_BUILD to know if we want to run slowcheck
Also kills horrible SKIP_TESTS hack along the way. Change-Id: Ida59fb44d247b52ef11ee7ba5e4e006996a87ebf
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in
index 633fed12760b..6316cd809d4d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -216,10 +216,10 @@ bootstrap: compilerplugins
# Build
#
build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
- $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild all slowcheck
+ $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild
-build-nocheck : export SKIP_TESTS := YES
-build-nocheck : build
+build-nocheck: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
+ $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build
cross-toolset: bootstrap fetch
$(GNUMAKE) gb_Side=build -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild
@@ -325,8 +325,8 @@ else ifeq ($(OS),MACOSX)
@echo "To debug: gdb install/LibreOffice.app/Contents/MacOS/soffice"
endif
-dev-install-nocheck : export SKIP_TESTS := YES
-dev-install-nocheck : dev-install
+dev-install-nocheck: build-nocheck
+ $(MAKE) dev-install -o build
dev-update:
ifeq ($(DISABLE_LINKOO),TRUE)