[m-rev.] for review: Enable parallel make in browser and ssdb directories.

Peter Wang novalazy at gmail.com
Mon Aug 5 12:21:08 AEST 2019


browser/Mmakefile:
    Delete .NOTPARALLEL target. The line appears to be only a leftover
    for a workaround that was in place when the browser directory
    contained both the mer_browser and mer_mdbcomp and libraries.

    Delete other lines which have been commented out since
    mdbcomp was moved to its own directory.

ssdb/Mmakefile:
    Delete the same lines copied from browser/Mmakefile.

diff --git a/browser/Mmakefile b/browser/Mmakefile
index fbda0c225..6cd48e965 100644
--- a/browser/Mmakefile
+++ b/browser/Mmakefile
@@ -163,29 +163,6 @@ aux:
 .PHONY: depend_aux
 depend_aux: browse_test.depend declarative_test.depend
 
-.NOTPARALLEL:
-
-# $(BROWSER_LIB_NAME).dep $(BROWSER_LIB_NAME).depend:
-# 	$(MCD) $(ALL_GRADEFLAGS) $(ALL_MCDFLAGS) $*
-
-# The need for these dependencies should be obviated by the fact that the
-# mdbcomp directory is brought up-to-date first.
-
-# lib$(BROWSER_LIB_NAME).so: lib$(MDBCOMP_LIB_NAME).so
-# lib$(BROWSER_LIB_NAME).dylib: lib$(MDBCOMP_LIB_NAME).dylib
-# lib$(BROWSER_LIB_NAME): lib$(MDBCOMP_LIB_NAME)
-# lib$(BROWSER_LIB_NAME).int3s: lib$(MDBCOMP_LIB_NAME).int3s
-# lib$(BROWSER_LIB_NAME).ints: lib$(MDBCOMP_LIB_NAME).ints
-# lib$(BROWSER_LIB_NAME).cs: lib$(MDBCOMP_LIB_NAME).cs
-# lib$(BROWSER_LIB_NAME).javas: lib$(MDBCOMP_LIB_NAME).javas
-# lib$(BROWSER_LIB_NAME).check: lib$(MDBCOMP_LIB_NAME).check
-# $($(BROWSER_LIB_NAME).ints): $($(MDBCOMP_LIB_NAME).ints)
-# $($(BROWSER_LIB_NAME).cs): $($(MDBCOMP_LIB_NAME).cs)
-# $($(BROWSER_LIB_NAME).javas): $($(MDBCOMP_LIB_NAME).java_dates)
-# $($(BROWSER_LIB_NAME).c_dates): $($(MDBCOMP_LIB_NAME).c_dates)
-# $($(BROWSER_LIB_NAME).s_dates): $($(MDBCOMP_LIB_NAME).s_dates)
-# $($(BROWSER_LIB_NAME).java_dates): $($(MDBCOMP_LIB_NAME).java_dates)
-
 # This directory contains source files for which the module
 # name doesn't match the file name, so smart recompilation
 # won't work without the Mercury.modules file.
diff --git a/ssdb/Mmakefile b/ssdb/Mmakefile
index ce5caac8a..a11b5b271 100644
--- a/ssdb/Mmakefile
+++ b/ssdb/Mmakefile
@@ -149,29 +149,6 @@ library: $(LIBS)
 depend:	SSDB_FLAGS $(DEPENDS)
 $(DEPENDS): Mercury.modules
 
-.NOTPARALLEL:
-
-# $(SSDB_LIB_NAME).dep $(SSDB_LIB_NAME).depend:
-# 	$(MCD) $(ALL_GRADEFLAGS) $(ALL_MCDFLAGS) $*
-
-# The need for these dependencies should be obviated by the fact that the
-# mdbcomp directory is brought up-to-date first.
-
-# lib$(SSDB_LIB_NAME).so: lib$(MDBCOMP_LIB_NAME).so
-# lib$(SSDB_LIB_NAME).dylib: lib$(MDBCOMP_LIB_NAME).dylib
-# lib$(SSDB_LIB_NAME): lib$(MDBCOMP_LIB_NAME)
-# lib$(SSDB_LIB_NAME).int3s: lib$(MDBCOMP_LIB_NAME).int3s
-# lib$(SSDB_LIB_NAME).ints: lib$(MDBCOMP_LIB_NAME).ints
-# lib$(SSDB_LIB_NAME).cs: lib$(MDBCOMP_LIB_NAME).cs
-# lib$(SSDB_LIB_NAME).javas: lib$(MDBCOMP_LIB_NAME).javas
-# lib$(SSDB_LIB_NAME).check: lib$(MDBCOMP_LIB_NAME).check
-# $($(SSDB_LIB_NAME).ints): $($(MDBCOMP_LIB_NAME).ints)
-# $($(SSDB_LIB_NAME).cs): $($(MDBCOMP_LIB_NAME).cs)
-# $($(SSDB_LIB_NAME).javas): $($(MDBCOMP_LIB_NAME).java_dates)
-# $($(SSDB_LIB_NAME).c_dates): $($(MDBCOMP_LIB_NAME).c_dates)
-# $($(SSDB_LIB_NAME).s_dates): $($(MDBCOMP_LIB_NAME).s_dates)
-# $($(SSDB_LIB_NAME).java_dates): $($(MDBCOMP_LIB_NAME).java_dates)
-
 # This directory contains source files for which the module
 # name doesn't match the file name, so smart recompilation
 # won't work without the Mercury.modules file.
-- 
2.22.0



More information about the reviews mailing list