summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-03-04 23:46:09 +0200
committerTor Lillqvist <tml@iki.fi>2012-03-05 02:05:24 +0200
commitc91f279e7e2fc1e520758016d35aee723d6e009b (patch)
treeff693c5d2a99d74df3f7712cc5ec5b7a8c355923 /Makefile
parent8d8c7739d7d47aa8da481d12b94d2d195bbe0467 (diff)
Revert "Build libsb with a few dummy classes also for --disable-scripting"
Nah, these dummy classes would turn out quite complex anyway. Better to just use ifdefs elsewhere, the number required is not that large. This reverts commit 6d33801b4498f5c13d2dc75588f88c22a11f455b.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index cd1d27febda6..b83ee6a67db0 100644
--- a/Makefile
+++ b/Makefile
@@ -384,12 +384,12 @@ bootstrap: $(WORKDIR_BOOTSTRAP)
#
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
+# We must get the headers from basic and vbahelper "delivered" because
+# as we don't link to any libs from those 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
+ $(GNUMAKE) basic vbahelper
endif
ifeq ($(DISABLE_DBCONNECTIVITY),TRUE)
# Ditto for dbconnectivity in the --disable-database-connectivity case