aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2015-01-23 16:08:12 -0800
committerPaul Eggert2015-01-23 16:08:57 -0800
commit02cbd38ae4e4a1e4d309a1bb27c031e154c53f27 (patch)
treeb144f6ad10c8ff452d16160c3e9cc92c406d8f11
parentac5475dacb20d240db27d56199910d8a6fcc90e8 (diff)
downloademacs-02cbd38ae4e4a1e4d309a1bb27c031e154c53f27.tar.gz
emacs-02cbd38ae4e4a1e4d309a1bb27c031e154c53f27.zip
Fix a couple of AM_V_GEN bugs
* admin/unidata/Makefile.in (unifiles): Use AM_V_at instead of AM_V_GEN, since this doesn't generate a file. * lib-src/Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0, am__v_GEN_1) (AM_V_at, am__v_at_, am__v_at_0, am__v_at_1): New macros, copied from ../src/Makefile.in.
-rw-r--r--admin/ChangeLog6
-rw-r--r--admin/unidata/Makefile.in2
-rw-r--r--lib-src/ChangeLog7
-rw-r--r--lib-src/Makefile.in10
4 files changed, 24 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 70d1714f8eb..e692ca0dbfd 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
12015-01-24 Paul Eggert <eggert@cs.ucla.edu>
2
3 Fix a couple of AM_V_GEN bugs
4 * unidata/Makefile.in (unifiles): Use AM_V_at instead of AM_V_GEN,
5 since this doesn't generate a file.
6
12015-01-15 Eli Zaretskii <eliz@gnu.org> 72015-01-15 Eli Zaretskii <eliz@gnu.org>
2 8
3 * unidata/uvs.el (uvs-print-table-ivd): Call set-binary-mode on 9 * unidata/uvs.el (uvs-print-table-ivd): Call set-binary-mode on
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index 1396f0926f4..6c81d32484a 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -90,7 +90,7 @@ ${unidir}/charprop.el: ${srcdir}/unidata-gen.el \
90## to generate a Makefile fragment explicitly listing the uni- files, 90## to generate a Makefile fragment explicitly listing the uni- files,
91## which this file could include. If no fragment, rebuild everything. 91## which this file could include. If no fragment, rebuild everything.
92unifiles: ${unidir}/charprop.el 92unifiles: ${unidir}/charprop.el
93 $(AM_V_GEN)for f in `sed -n 's/^;; FILE: //p' < $<`; do \ 93 $(AM_V_at)for f in `sed -n 's/^;; FILE: //p' < $<`; do \
94 [ -f $(unidir)/$$f ] || exec $(MAKE) PHONY_EXTRAS=$< $<; \ 94 [ -f $(unidir)/$$f ] || exec $(MAKE) PHONY_EXTRAS=$< $<; \
95 done 95 done
96 96
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 6cf82e91508..8d2c95e671c 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,10 @@
12015-01-24 Paul Eggert <eggert@cs.ucla.edu>
2
3 Fix a couple of AM_V_GEN bugs
4 * Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0, am__v_GEN_1)
5 (AM_V_at, am__v_at_, am__v_at_0, am__v_at_1):
6 New macros, copied from ../src/Makefile.in.
7
12015-01-22 Paul Eggert <eggert@cs.ucla.edu> 82015-01-22 Paul Eggert <eggert@cs.ucla.edu>
2 9
3 Check exit statuses in lib-src/Makefile 10 Check exit statuses in lib-src/Makefile
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 1b329c2f221..d2705e7b5dc 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -58,11 +58,21 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
58am__v_CCLD_0 = @echo " CCLD " $@; 58am__v_CCLD_0 = @echo " CCLD " $@;
59am__v_CCLD_1 = 59am__v_CCLD_1 =
60 60
61AM_V_GEN = $(am__v_GEN_@AM_V@)
62am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
63am__v_GEN_0 = @echo " GEN " $@;
64am__v_GEN_1 =
65
61AM_V_RC = $(am__v_RC_@AM_V@) 66AM_V_RC = $(am__v_RC_@AM_V@)
62am__v_RC_ = $(am__v_RC_@AM_DEFAULT_V@) 67am__v_RC_ = $(am__v_RC_@AM_DEFAULT_V@)
63am__v_RC_0 = @echo " RC " $@; 68am__v_RC_0 = @echo " RC " $@;
64am__v_RC_1 = 69am__v_RC_1 =
65 70
71AM_V_at = $(am__v_at_@AM_V@)
72am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
73am__v_at_0 = @
74am__v_at_1 =
75
66# ==================== Where To Install Things ==================== 76# ==================== Where To Install Things ====================
67 77
68# Location to install Emacs.app under GNUstep / Mac OS X. 78# Location to install Emacs.app under GNUstep / Mac OS X.