VM

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

Proposed by Mark Diekhans on 2017-08-13
Status: Needs review
Proposed branch: lp:~markd-kermodei/vm/make-compat
Merge into: lp:vm
Diff against target: 146 lines (+31/-23)
3 files modified
Makefile.in (+7/-4)
lisp/Makefile.in (+23/-18)
lisp/vm-pcrisis.el (+1/-1)
To merge this branch: bzr merge lp:~markd-kermodei/vm/make-compat
Reviewer Review Type Date Requested Status
Uday Reddy 2017-08-13 Pending
Review via email: mp+328957@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
lp:~markd-kermodei/vm/make-compat updated on 2018-06-04
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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
32all: vm-load.el32all: vm-load.el
33 @for i in $(SUBDIRS) ; do ($(MAKE) -C $$i) || exit 1; done33 @for i in $(SUBDIRS) ; do ($(MAKE) -C $$i) || exit 1; done
3434
35Makefile vm-load.el: %: config.status @srcdir@/%.in35vm-load.el: @srcdir@/vm-load.el.in config.status
36 ./config.status $@
37
38Makefile: @srcdir@/Makefile.in config.status
36 ./config.status $@39 ./config.status $@
3740
38@srcdir@/configure: @srcdir@/configure.ac41@srcdir@/configure: @srcdir@/configure.ac
@@ -71,9 +74,9 @@
71 exit 1; \74 exit 1; \
72 fi75 fi
73 -$(RM) -rf ,,package76 -$(RM) -rf ,,package
74 cd lisp; make PACKAGEDIR=$(PKGDIR)/lisp/vm install-pkg77 cd lisp && $(make) PACKAGEDIR=$(PKGDIR)/lisp/vm install-pkg
75 cd info; make infodir=$(PKGDIR)/info install-pkg78 cd info && $(make) infodir=$(PKGDIR)/info install-pkg
76 cd src; make infodir=$(PKGDIR)/bin install-pkg79 cd src && $(make) infodir=$(PKGDIR)/bin install-pkg
77 echo ";;;###autoload" > $(PKGINFO)80 echo ";;;###autoload" > $(PKGINFO)
78 echo "(package-provide 'vm'" > $(PKGINFO)81 echo "(package-provide 'vm'" > $(PKGINFO)
79 echo " :version 0.7" >> $(PKGINFO)82 echo " :version 0.7" >> $(PKGINFO)
8083
=== 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 @@
63SOURCES += tapestry.el63SOURCES += tapestry.el
64SOURCES += u-vm-color.el64SOURCES += u-vm-color.el
6565
66# autoloads differ depending on emacs flavor
67emacs_AUTOLOADS = vm-autoloads.el
68xemacs_AUTOLOADS = auto-autoloads.el
69AUTOLOADS = ${@EMACS_FLAVOR@_AUTOLOADS}
70
66# to list of object files71# to list of object files
67ifeq (@EMACS_FLAVOR@,emacs)72emacs_OBJECTS = vm-autoloads.elc vm-cus-load.elc
68OBJECTS = vm-autoloads.elc vm-cus-load.elc73xemacs_OBJECTS = auto-autoloads.elc custom-load.elc
69else
70OBJECTS = auto-autoloads.elc custom-load.elc
71endif
7274
73OBJECTS += $(SOURCES:.el=.elc)75OBJECTS = ${@EMACS_FLAVOR@_OBJECTS} $(SOURCES:.el=.elc)
7476
75AUX_FILES = version.txt77AUX_FILES = version.txt
7678
@@ -81,6 +83,9 @@
81AUTOLOAD_PACKAGE_NAME = (setq autoload-package-name \"vm\")83AUTOLOAD_PACKAGE_NAME = (setq autoload-package-name \"vm\")
82AUTOLOAD_FILE = (setq generated-autoload-file \"./auto-autoloads.el\")84AUTOLOAD_FILE = (setq generated-autoload-file \"./auto-autoloads.el\")
8385
86# for BSDmake
87.SUFFIXES: .el .elc
88
84##############################################################################89##############################################################################
85# location of required programms90# location of required programms
86RM = @RM@91RM = @RM@
@@ -105,19 +110,19 @@
105110
106FLAGS = @FLAGS@111FLAGS = @FLAGS@
107112
108EMACS_COMP = lispdir="$(lispdir)" srcdir="$(srcdir)" "$(EMACS_PROG)" $(FLAGS)113EMACS_COMP = OTHERDIRS=@OTHERDIRS@ "$(EMACS_PROG)" $(FLAGS)
109
110export OTHERDIRS = @OTHERDIRS@
111114
112SYMLINKS = @SYMLINKS@115SYMLINKS = @SYMLINKS@
113LINKPATH = @LINKPATH@116LINKPATH = @LINKPATH@
114117
115.el.elc:118.el.elc:
116 "$(EMACS_PROG)" $(FLAGS) -f batch-byte-compile $<119 $(EMACS_COMP) -f batch-byte-compile $<
117120
118##############################################################################121##############################################################################
119all: $(OBJECTS)122all: $(OBJECTS)
120123
124$(OBJECTS): $(AUTOLOADS)
125
121install: install-el install-elc install-aux126install: install-el install-elc install-aux
122127
123##############################################################################128##############################################################################
@@ -136,7 +141,7 @@
136 -$(RM) -f $@141 -$(RM) -f $@
137 echo > $@142 echo > $@
138 (build_dir="`pwd`"; cd "@srcdir@"; \143 (build_dir="`pwd`"; cd "@srcdir@"; \
139 "$(EMACS_PROG)" $(FLAGS) -l autoload \144 $(EMACS_COMP) -l autoload \
140 -f vm-built-autoloads "@abs_builddir@/$@" "`pwd`")145 -f vm-built-autoloads "@abs_builddir@/$@" "`pwd`")
141 echo "(custom-add-load 'vm 'vm-cus-load)" | tr -d '\015' >> $@146 echo "(custom-add-load 'vm 'vm-cus-load)" | tr -d '\015' >> $@
142 echo "(setq vm-configure-datadir \"${etcdir}\")" | tr -d '\015' >> $@147 echo "(setq vm-configure-datadir \"${etcdir}\")" | tr -d '\015' >> $@
@@ -147,11 +152,11 @@
147 echo "(provide 'vm-autoloads)" | tr -d '\015' >> $@152 echo "(provide 'vm-autoloads)" | tr -d '\015' >> $@
148153
149vm-cus-load.el: $(SOURCES:%=@srcdir@/%)154vm-cus-load.el: $(SOURCES:%=@srcdir@/%)
150 "$(EMACS_PROG)" $(FLAGS) -f vm-custom-make-dependencies .155 $(EMACS_COMP) -f vm-custom-make-dependencies .
151ifeq (@EMACS_VERSION@,21)156 if [ "@EMACS_VERSION" = "21" ] ; then \
152 sed -e "s/provide 'cus-load/provide 'vm-cus-load/" cus-load.el > $@157 sed -e "s/provide 'cus-load/provide 'vm-cus-load/" cus-load.el > $@ ;\
153 $(RM) cus-load.el158 $(RM) cus-load.el ;\
154endif159 fi
155160
156##############################################################################161##############################################################################
157# XEmacs#s auto-autoloads and custom-load file162# XEmacs#s auto-autoloads and custom-load file
@@ -160,7 +165,7 @@
160# (build_dir=`pwd`; cd "@srcdir@"; \165# (build_dir=`pwd`; cd "@srcdir@"; \
161# $(EMACS_PROG) $(FLAGS) -l autoload \166# $(EMACS_PROG) $(FLAGS) -l autoload \
162# -f vm-built-autoloads "@abs_builddir@/$@" "`pwd`")167# -f vm-built-autoloads "@abs_builddir@/$@" "`pwd`")
163 "$(EMACS_PROG)" $(FLAGS) \168 $(EMACS_COMP) \
164 -eval "$(AUTOLOAD_PACKAGE_NAME)" \169 -eval "$(AUTOLOAD_PACKAGE_NAME)" \
165 -eval "$(AUTOLOAD_FILE)" \170 -eval "$(AUTOLOAD_FILE)" \
166 -l autoload -f batch-update-autoloads $^171 -l autoload -f batch-update-autoloads $^
@@ -178,7 +183,7 @@
178183
179184
180custom-load.el: $(SOURCES:%=@srcdir@/%)185custom-load.el: $(SOURCES:%=@srcdir@/%)
181 "$(EMACS_PROG)" $(FLAGS) -f vm-custom-make-dependencies .186 $(EMACS_COMP) -f vm-custom-make-dependencies .
182187
183##############################################################################188##############################################################################
184install-pkg: all $(INSTALL_FILES)189install-pkg: all $(INSTALL_FILES)
185190
=== 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 @@
1246;; Functions for vmpc-conditions:1246;; Functions for vmpc-conditions:
1247;; -------------------------------------------------------------------1247;; -------------------------------------------------------------------
12481248
1249(defun vmpc-none-true-yet (&optional &rest exceptions)1249(defun vmpc-none-true-yet (&rest exceptions)
1250 "True if none of the previous evaluated conditions was true.1250 "True if none of the previous evaluated conditions was true.
1251This is a condition that can appear in `vmpc-conditions'. If EXCEPTIONS are1251This is a condition that can appear in `vmpc-conditions'. If EXCEPTIONS are
1252specified, it means none were true except those. For example, if you wanted1252specified, it means none were true except those. For example, if you wanted

Subscribers

People subscribed via source and target branches

to all changes: