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
1=== modified file 'Makefile.in'
2--- Makefile.in 2011-12-30 17:21:27 +0000
3+++ Makefile.in 2018-06-04 05:12:05 +0000
4@@ -32,7 +32,10 @@
5 all: vm-load.el
6 @for i in $(SUBDIRS) ; do ($(MAKE) -C $$i) || exit 1; done
7
8-Makefile vm-load.el: %: config.status @srcdir@/%.in
9+vm-load.el: @srcdir@/vm-load.el.in config.status
10+ ./config.status $@
11+
12+Makefile: @srcdir@/Makefile.in config.status
13 ./config.status $@
14
15 @srcdir@/configure: @srcdir@/configure.ac
16@@ -71,9 +74,9 @@
17 exit 1; \
18 fi
19 -$(RM) -rf ,,package
20- cd lisp; make PACKAGEDIR=$(PKGDIR)/lisp/vm install-pkg
21- cd info; make infodir=$(PKGDIR)/info install-pkg
22- cd src; make infodir=$(PKGDIR)/bin install-pkg
23+ cd lisp && $(make) PACKAGEDIR=$(PKGDIR)/lisp/vm install-pkg
24+ cd info && $(make) infodir=$(PKGDIR)/info install-pkg
25+ cd src && $(make) infodir=$(PKGDIR)/bin install-pkg
26 echo ";;;###autoload" > $(PKGINFO)
27 echo "(package-provide 'vm'" > $(PKGINFO)
28 echo " :version 0.7" >> $(PKGINFO)
29
30=== modified file 'lisp/Makefile.in'
31--- lisp/Makefile.in 2012-03-05 23:08:52 +0000
32+++ lisp/Makefile.in 2018-06-04 05:12:05 +0000
33@@ -63,14 +63,16 @@
34 SOURCES += tapestry.el
35 SOURCES += u-vm-color.el
36
37+# autoloads differ depending on emacs flavor
38+emacs_AUTOLOADS = vm-autoloads.el
39+xemacs_AUTOLOADS = auto-autoloads.el
40+AUTOLOADS = ${@EMACS_FLAVOR@_AUTOLOADS}
41+
42 # to list of object files
43-ifeq (@EMACS_FLAVOR@,emacs)
44-OBJECTS = vm-autoloads.elc vm-cus-load.elc
45-else
46-OBJECTS = auto-autoloads.elc custom-load.elc
47-endif
48+emacs_OBJECTS = vm-autoloads.elc vm-cus-load.elc
49+xemacs_OBJECTS = auto-autoloads.elc custom-load.elc
50
51-OBJECTS += $(SOURCES:.el=.elc)
52+OBJECTS = ${@EMACS_FLAVOR@_OBJECTS} $(SOURCES:.el=.elc)
53
54 AUX_FILES = version.txt
55
56@@ -81,6 +83,9 @@
57 AUTOLOAD_PACKAGE_NAME = (setq autoload-package-name \"vm\")
58 AUTOLOAD_FILE = (setq generated-autoload-file \"./auto-autoloads.el\")
59
60+# for BSDmake
61+.SUFFIXES: .el .elc
62+
63 ##############################################################################
64 # location of required programms
65 RM = @RM@
66@@ -105,19 +110,19 @@
67
68 FLAGS = @FLAGS@
69
70-EMACS_COMP = lispdir="$(lispdir)" srcdir="$(srcdir)" "$(EMACS_PROG)" $(FLAGS)
71-
72-export OTHERDIRS = @OTHERDIRS@
73+EMACS_COMP = OTHERDIRS=@OTHERDIRS@ "$(EMACS_PROG)" $(FLAGS)
74
75 SYMLINKS = @SYMLINKS@
76 LINKPATH = @LINKPATH@
77
78 .el.elc:
79- "$(EMACS_PROG)" $(FLAGS) -f batch-byte-compile $<
80+ $(EMACS_COMP) -f batch-byte-compile $<
81
82 ##############################################################################
83 all: $(OBJECTS)
84
85+$(OBJECTS): $(AUTOLOADS)
86+
87 install: install-el install-elc install-aux
88
89 ##############################################################################
90@@ -136,7 +141,7 @@
91 -$(RM) -f $@
92 echo > $@
93 (build_dir="`pwd`"; cd "@srcdir@"; \
94- "$(EMACS_PROG)" $(FLAGS) -l autoload \
95+ $(EMACS_COMP) -l autoload \
96 -f vm-built-autoloads "@abs_builddir@/$@" "`pwd`")
97 echo "(custom-add-load 'vm 'vm-cus-load)" | tr -d '\015' >> $@
98 echo "(setq vm-configure-datadir \"${etcdir}\")" | tr -d '\015' >> $@
99@@ -147,11 +152,11 @@
100 echo "(provide 'vm-autoloads)" | tr -d '\015' >> $@
101
102 vm-cus-load.el: $(SOURCES:%=@srcdir@/%)
103- "$(EMACS_PROG)" $(FLAGS) -f vm-custom-make-dependencies .
104-ifeq (@EMACS_VERSION@,21)
105- sed -e "s/provide 'cus-load/provide 'vm-cus-load/" cus-load.el > $@
106- $(RM) cus-load.el
107-endif
108+ $(EMACS_COMP) -f vm-custom-make-dependencies .
109+ if [ "@EMACS_VERSION" = "21" ] ; then \
110+ sed -e "s/provide 'cus-load/provide 'vm-cus-load/" cus-load.el > $@ ;\
111+ $(RM) cus-load.el ;\
112+ fi
113
114 ##############################################################################
115 # XEmacs#s auto-autoloads and custom-load file
116@@ -160,7 +165,7 @@
117 # (build_dir=`pwd`; cd "@srcdir@"; \
118 # $(EMACS_PROG) $(FLAGS) -l autoload \
119 # -f vm-built-autoloads "@abs_builddir@/$@" "`pwd`")
120- "$(EMACS_PROG)" $(FLAGS) \
121+ $(EMACS_COMP) \
122 -eval "$(AUTOLOAD_PACKAGE_NAME)" \
123 -eval "$(AUTOLOAD_FILE)" \
124 -l autoload -f batch-update-autoloads $^
125@@ -178,7 +183,7 @@
126
127
128 custom-load.el: $(SOURCES:%=@srcdir@/%)
129- "$(EMACS_PROG)" $(FLAGS) -f vm-custom-make-dependencies .
130+ $(EMACS_COMP) -f vm-custom-make-dependencies .
131
132 ##############################################################################
133 install-pkg: all $(INSTALL_FILES)
134
135=== modified file 'lisp/vm-pcrisis.el'
136--- lisp/vm-pcrisis.el 2016-10-29 23:36:16 +0000
137+++ lisp/vm-pcrisis.el 2018-06-04 05:12:05 +0000
138@@ -1246,7 +1246,7 @@
139 ;; Functions for vmpc-conditions:
140 ;; -------------------------------------------------------------------
141
142-(defun vmpc-none-true-yet (&optional &rest exceptions)
143+(defun vmpc-none-true-yet (&rest exceptions)
144 "True if none of the previous evaluated conditions was true.
145 This is a condition that can appear in `vmpc-conditions'. If EXCEPTIONS are
146 specified, it means none were true except those. For example, if you wanted

Subscribers

People subscribed via source and target branches

to all changes: