Build extra_targets. in particular, build eventsql only if configured to do so.

Copied from Perforce
 Change: 180912
 ServerID: perforce.ravenbrook.com

1 files changed, 12 insertions, 2 deletions

diff --git a/mps/code/comm.gmk b/mps/code/comm.gmk
index 1e568b83244..f0610635ad7 100644
--- a/mps/code/comm.gmk
+++ b/mps/code/comm.gmk
@@ -11,6 +11,7 @@
 # PARAMETERS
 #
 # Assumes the following variables and definitions:
+# EXTRA_TARGETS     a list of extra targets to build
 # CFLAGSCOMPILER    a list of flags for all compilations
 # CFLAGSSTRICT      a list of flags for almost all compilations
 # CFLAGSLAX         a list of flags for compilations which can't be as
@@ -67,6 +68,15 @@ ifndef CFLAGSOPT
 error "comm.gmk: CFLAGSOPT not defined"
 endif
 
+
+# EXTRA TARGETS
+#
+# Don't build eventsql by default (might not have sqlite3 installed),
+# but do build eventcnv and eventtxt.
+
+EXTRA_TARGETS ?= eventcnv eventtxt
+
+
 #
 # %%PART: When adding a new part, add checks for the parameter with the
 #         sources for the new part.
@@ -212,7 +222,7 @@ all: mpmss sacss amcss amcsshe amsss amssshe segsmss awlut awluthe \
      finalcv finaltest arenacv bttest teletest \
      abqtest cbstest btcv mv2test messtest steptest \
      walkt0 zcoll zmess \
-     eventcnv eventtxt eventsql \
+     $(EXTRA_TARGETS) \
      mps.a mpsplan.a
 
 
@@ -241,7 +251,7 @@ mpmss sacss amcss amcssth amcsshe amsss amssshe segsmss awlut awlutth \
   walkt0 \
   exposet0 \
   zcoll zmess \
-  eventcnv eventtxt eventsql replay replaysw \
+  $(EXTRA_TARGETS) replay replaysw \
   mps.a mpsplan.a: phony
 ifdef VARIETY
         $(MAKE) -f $(PFM).gmk TARGET=$@ variety