Merge lp:~markd-kermodei/vm/make-compat into lp:vm

[Mark Diekhans]

Fixed compatibility issues with BSD make
Allow parallel builds of Lisp by generating autoloads before byte compiling

Note, that actual changes are in revision #1517 Revision #1518 just set the ticket number.

[lp:~markd-kermodei/vm/make-compat]

1519. By Mark Diekhans on 2018-06-04

Removed spurious &optional, which is now an error in in emacs 26.

Unmerged revisions

1519. By Mark Diekhans on 2018-06-04

Removed spurious &optional, which is now an error in in emacs 26.

1518. By Mark Diekhans on 2017-08-13

link changes to BSD make compatiblity bug

1517. By Mark Diekhans on 2017-08-13

Makefile compatiblity with BSD make.
Allow parallel builds by generate autoloads before byte compiling

=== modified file 'Makefile.in'
--- Makefile.in	2011-12-30 17:21:27 +0000
+++ Makefile.in	2018-06-04 05:12:05 +0000
@@ -32,7 +32,10 @@
 all: vm-load.el
 	@for i in $(SUBDIRS) ; do ($(MAKE) -C $$i) || exit 1; done
 
-Makefile vm-load.el: %: config.status @srcdir@/%.in
+vm-load.el: @srcdir@/vm-load.el.in config.status
+	./config.status $@
+
+Makefile:  @srcdir@/Makefile.in config.status
 	./config.status $@
 
 @srcdir@/configure: @srcdir@/configure.ac
@@ -71,9 +74,9 @@
 	  exit 1; \
 	fi
 	-$(RM) -rf ,,package
-	cd lisp; make PACKAGEDIR=$(PKGDIR)/lisp/vm install-pkg
-	cd info; make infodir=$(PKGDIR)/info install-pkg
-	cd src; make infodir=$(PKGDIR)/bin install-pkg
+	cd lisp && $(make) PACKAGEDIR=$(PKGDIR)/lisp/vm install-pkg
+	cd info && $(make) infodir=$(PKGDIR)/info install-pkg
+	cd src && $(make) infodir=$(PKGDIR)/bin install-pkg
 	echo ";;;###autoload" > $(PKGINFO)
 	echo "(package-provide 'vm'" > $(PKGINFO)
 	echo "         :version 0.7" >> $(PKGINFO)

=== modified file 'lisp/Makefile.in'
--- lisp/Makefile.in	2012-03-05 23:08:52 +0000
+++ lisp/Makefile.in	2018-06-04 05:12:05 +0000
@@ -63,14 +63,16 @@
 SOURCES += tapestry.el
 SOURCES += u-vm-color.el
 
+# autoloads differ depending on emacs flavor
+emacs_AUTOLOADS = vm-autoloads.el
+xemacs_AUTOLOADS = auto-autoloads.el
+AUTOLOADS = ${@EMACS_FLAVOR@_AUTOLOADS}
+
 # to list of object files
-ifeq (@EMACS_FLAVOR@,emacs)
-OBJECTS = vm-autoloads.elc vm-cus-load.elc
-else
-OBJECTS = auto-autoloads.elc custom-load.elc
-endif
+emacs_OBJECTS = vm-autoloads.elc vm-cus-load.elc
+xemacs_OBJECTS = auto-autoloads.elc custom-load.elc
 
-OBJECTS += $(SOURCES:.el=.elc)
+OBJECTS = ${@EMACS_FLAVOR@_OBJECTS} $(SOURCES:.el=.elc)
 
 AUX_FILES = version.txt
 
@@ -81,6 +83,9 @@
 AUTOLOAD_PACKAGE_NAME = (setq autoload-package-name \"vm\")
 AUTOLOAD_FILE = (setq generated-autoload-file \"./auto-autoloads.el\")
 
+# for BSDmake
+.SUFFIXES: .el .elc
+
 ##############################################################################
 # location of required programms
 RM   = @RM@
@@ -105,19 +110,19 @@
 
 FLAGS = @FLAGS@
 
-EMACS_COMP = lispdir="$(lispdir)" srcdir="$(srcdir)" "$(EMACS_PROG)" $(FLAGS)
-
-export OTHERDIRS = @OTHERDIRS@
+EMACS_COMP = OTHERDIRS=@OTHERDIRS@ "$(EMACS_PROG)" $(FLAGS)
 
 SYMLINKS = @SYMLINKS@
 LINKPATH = @LINKPATH@
 
 .el.elc:
-	"$(EMACS_PROG)" $(FLAGS) -f batch-byte-compile $<
+	$(EMACS_COMP) -f batch-byte-compile $<
 
 ##############################################################################
 all: $(OBJECTS)
 
+$(OBJECTS): $(AUTOLOADS)
+
 install: install-el install-elc install-aux
 
 ##############################################################################
@@ -136,7 +141,7 @@
 	-$(RM) -f $@
 	echo > $@
 	(build_dir="`pwd`"; cd "@srcdir@"; \
-	 "$(EMACS_PROG)" $(FLAGS) -l autoload \
+	 $(EMACS_COMP) -l autoload \
 		-f vm-built-autoloads "@abs_builddir@/$@" "`pwd`")
 	echo "(custom-add-load 'vm 'vm-cus-load)" | tr -d '\015' >> $@
 	echo "(setq vm-configure-datadir \"${etcdir}\")" | tr -d '\015' >> $@
@@ -147,11 +152,11 @@
 	echo "(provide 'vm-autoloads)" | tr -d '\015' >> $@
 
 vm-cus-load.el: $(SOURCES:%=@srcdir@/%)
-	"$(EMACS_PROG)" $(FLAGS) -f vm-custom-make-dependencies .
-ifeq (@EMACS_VERSION@,21)
-	sed -e "s/provide 'cus-load/provide 'vm-cus-load/" cus-load.el > $@
-	$(RM) cus-load.el
-endif
+	$(EMACS_COMP) -f vm-custom-make-dependencies .
+	if [ "@EMACS_VERSION" = "21" ] ; then \
+	    sed -e "s/provide 'cus-load/provide 'vm-cus-load/" cus-load.el > $@ ;\
+	   $(RM) cus-load.el ;\
+        fi
 
 ##############################################################################
 # XEmacs#s auto-autoloads and custom-load file
@@ -160,7 +165,7 @@
 #	(build_dir=`pwd`; cd "@srcdir@"; \
 #	 $(EMACS_PROG) $(FLAGS) -l autoload \
 #		-f vm-built-autoloads "@abs_builddir@/$@" "`pwd`")
-	"$(EMACS_PROG)" $(FLAGS) \
+	$(EMACS_COMP) \
                 -eval "$(AUTOLOAD_PACKAGE_NAME)" \
                 -eval "$(AUTOLOAD_FILE)" \
                 -l autoload -f batch-update-autoloads $^
@@ -178,7 +183,7 @@
 
 
 custom-load.el: $(SOURCES:%=@srcdir@/%)
-	"$(EMACS_PROG)" $(FLAGS) -f vm-custom-make-dependencies .
+	$(EMACS_COMP) -f vm-custom-make-dependencies .
 
 ##############################################################################
 install-pkg: all $(INSTALL_FILES)

=== modified file 'lisp/vm-pcrisis.el'
--- lisp/vm-pcrisis.el	2016-10-29 23:36:16 +0000
+++ lisp/vm-pcrisis.el	2018-06-04 05:12:05 +0000
@@ -1246,7 +1246,7 @@
 ;; Functions for vmpc-conditions:
 ;; -------------------------------------------------------------------
 
-(defun vmpc-none-true-yet (&optional &rest exceptions)
+(defun vmpc-none-true-yet (&rest exceptions)
   "True if none of the previous evaluated conditions was true.
 This is a condition that can appear in `vmpc-conditions'.  If EXCEPTIONS are
 specified, it means none were true except those.  For example, if you wanted