diff options
| author | Kenichi Handa | 2014-06-28 10:35:48 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2014-06-28 10:35:48 +0900 |
| commit | f036e167feaf875873636972b28a4adc12c32254 (patch) | |
| tree | 440e45ae8951f7030393b130b184f2b1882070ee /oldXMenu | |
| parent | 1fc00e5c9e87c88b4b253692d6ade822f6d74d3e (diff) | |
| parent | 2c4e2e6fd3096eb615504e3cfc89c588ec620f78 (diff) | |
| download | emacs-f036e167feaf875873636972b28a4adc12c32254.tar.gz emacs-f036e167feaf875873636972b28a4adc12c32254.zip | |
merge trunk
Diffstat (limited to 'oldXMenu')
| -rw-r--r-- | oldXMenu/ChangeLog | 2 | ||||
| -rw-r--r-- | oldXMenu/Makefile.in | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index f3736cdacfa..74686f64972 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2014-06-15 Glenn Morris <rgm@gnu.org> | 1 | 2014-06-15 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * Makefile.in (CPPFLAGS): Explicitly set via configure. | ||
| 4 | |||
| 3 | * Makefile.in (mostlyclean, clean, distclean, maintainer-clean, tags): | 5 | * Makefile.in (mostlyclean, clean, distclean, maintainer-clean, tags): |
| 4 | Declare as PHONY. | 6 | Declare as PHONY. |
| 5 | (boostrap-clean): New. | 7 | (boostrap-clean): New. |
diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index 28fbf1eb366..91b313ac627 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in | |||
| @@ -56,6 +56,8 @@ WERROR_CFLAGS = @WERROR_CFLAGS@ | |||
| 56 | EXTRA=insque.o | 56 | EXTRA=insque.o |
| 57 | CC=@CC@ | 57 | CC=@CC@ |
| 58 | CFLAGS=@CFLAGS@ | 58 | CFLAGS=@CFLAGS@ |
| 59 | CPPFLAGS = @CPPFLAGS@ | ||
| 60 | |||
| 59 | TAGS = etags | 61 | TAGS = etags |
| 60 | RM = rm -f | 62 | RM = rm -f |
| 61 | RANLIB = @RANLIB@ | 63 | RANLIB = @RANLIB@ |