Makefile.in | 12 ------------
1 file changed, 12 deletions(-)
New commits:
commit c9f637c882a90940bc99ec55b9713230ab26a675
Author: Peter Foley <pefol...@verizon.net>
Date: Wed Feb 27 18:02:40 2013 -0500
don't build modules twice
Change-Id: I179f81b92b815f17cd5da77a921b563ee36cb467
diff --git a/Makefile.in b/Makefile.in
index aee4b90..c9f8ccf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -183,18 +183,6 @@ bootstrap: compilerplugins
# Build
#
build: bootstrap fetch $(if $(filter
$(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
-ifeq ($(DISABLE_SCRIPTING),TRUE)
-# We must get the headers from vbahelper "delivered" because
-# as we don't link to any libs from there they won't otherwise be, or
-# something. And we still do include those headers always even if the
-# libs aren't built in the --disable-scripting case. (Ifdefs for
-# DISABLE_SCRIPTING will be added to the code later as necessary.)
- $(GNUMAKE) vbahelper
-endif
-ifeq ($(DISABLE_DBCONNECTIVITY),TRUE)
-# Ditto for dbconnectivity in the --disable-database-connectivity case
- $(GNUMAKE) connectivity
-endif
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.build all slowcheck
ifeq ($(OS),ANDROID)
cd android && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
