diff options
| author | Kenichi Handa | 2010-05-27 16:08:37 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2010-05-27 16:08:37 +0900 |
| commit | 478ebb73bb3b80bf2a0a55081f9753639d98fd4a (patch) | |
| tree | b6348bdf7c6f583c7bf3f7793e460cec50d64c8a /lib-src | |
| parent | 2b25da455e14b3712f544ebf7fb1c83d17353130 (diff) | |
| parent | b7bd84780e8a409dd1df344a5c6a78339b183d26 (diff) | |
| download | emacs-478ebb73bb3b80bf2a0a55081f9753639d98fd4a.tar.gz emacs-478ebb73bb3b80bf2a0a55081f9753639d98fd4a.zip | |
merge trunk
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index d2c7301fb6f..ac1641a552e 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-05-27 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (distclean): No more Makefile.c. | ||
| 4 | |||
| 1 | 2010-05-22 Jan Djärv <jan.h.d@swipnet.se> | 5 | 2010-05-22 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | * Makefile.in (STAMP_INST_SCRIPTS, STAMP_SCRIPS): New (Bug #6246). | 7 | * Makefile.in (STAMP_INST_SCRIPTS, STAMP_SCRIPS): New (Bug #6246). |
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 1c19dec276b..264f14b1d49 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in | |||
| @@ -283,7 +283,7 @@ clean: mostlyclean | |||
| 283 | 283 | ||
| 284 | distclean: clean | 284 | distclean: clean |
| 285 | -rm -f TAGS | 285 | -rm -f TAGS |
| 286 | -rm -f Makefile Makefile.c blessmail | 286 | -rm -f Makefile blessmail |
| 287 | 287 | ||
| 288 | maintainer-clean: distclean | 288 | maintainer-clean: distclean |
| 289 | true | 289 | true |