diff options
| author | Glenn Morris | 2012-06-05 21:38:04 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-06-05 21:38:04 -0400 |
| commit | 67163749cc44f81f157fce9b63aa718dc5f49538 (patch) | |
| tree | bbe572a8bba461025d454294b0ee522595261553 /lib-src | |
| parent | f7dd4e98e4c50f9d058d49218d1ef7abc7cb553f (diff) | |
| download | emacs-67163749cc44f81f157fce9b63aa718dc5f49538.tar.gz emacs-67163749cc44f81f157fce9b63aa718dc5f49538.zip | |
Remove script stamping in lib-src/
rcs2log no longer needs it, and grep-changelog never really has
(nothing in Emacs runs that, I don't know why Emacs includes it, if you
are using an uninstalled out-of-tree build you can just as easily run
it from the source directory).
* lib-src/Makefile.in (STAMP_INST_SCRIPTS, STAMP_SCRIPTS, insrcdir)
(stamp-rcs2log, stamp-grep-changelog): Remove.
(all, clean): Remove references to stamps.
* .bzrignore: Do not ignore lib-src/stamp*.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 18 |
2 files changed, 5 insertions, 17 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index a1cdb53649d..b6f5c3ead60 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2012-06-06 Glenn Morris <rgm@gnu.org> | 1 | 2012-06-06 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * Makefile.in (STAMP_INST_SCRIPTS, STAMP_SCRIPTS, insrcdir) | ||
| 4 | (stamp-rcs2log, stamp-grep-changelog): Remove. | ||
| 5 | (all, clean): Remove references to stamps. | ||
| 6 | |||
| 3 | * vcdiff: Remove file. | 7 | * vcdiff: Remove file. |
| 4 | * Makefile.in (SCRIPTS, STAMP_SCRIPTS): Remove vcdiff. | 8 | * Makefile.in (SCRIPTS, STAMP_SCRIPTS): Remove vcdiff. |
| 5 | (stamp-vcdiff): Remove. | 9 | (stamp-vcdiff): Remove. |
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 136045a9cd5..2df22d9f7d8 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in | |||
| @@ -118,7 +118,6 @@ INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} \ | |||
| 118 | ebrowse${EXEEXT} | 118 | ebrowse${EXEEXT} |
| 119 | 119 | ||
| 120 | INSTALLABLE_SCRIPTS = grep-changelog | 120 | INSTALLABLE_SCRIPTS = grep-changelog |
| 121 | STAMP_INST_SCRIPTS = stamp-grep-changelog | ||
| 122 | 121 | ||
| 123 | # Things that Emacs runs internally, or during the build process, | 122 | # Things that Emacs runs internally, or during the build process, |
| 124 | # which should not be installed in bindir. | 123 | # which should not be installed in bindir. |
| @@ -130,7 +129,6 @@ DONT_INSTALL= test-distrib${EXEEXT} make-docfile${EXEEXT} | |||
| 130 | # Like UTILITIES, but they're not system-dependent, and should not be | 129 | # Like UTILITIES, but they're not system-dependent, and should not be |
| 131 | # deleted by the distclean target. | 130 | # deleted by the distclean target. |
| 132 | SCRIPTS= rcs2log | 131 | SCRIPTS= rcs2log |
| 133 | STAMP_SCRIPTS= stamp-rcs2log | ||
| 134 | 132 | ||
| 135 | # All files that are created by the linker, i.e., whose names end in ${EXEEXT}. | 133 | # All files that are created by the linker, i.e., whose names end in ${EXEEXT}. |
| 136 | EXE_FILES = ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL} | 134 | EXE_FILES = ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL} |
| @@ -181,24 +179,11 @@ ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} | |||
| 181 | LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS} | 179 | LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS} |
| 182 | CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS} | 180 | CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS} |
| 183 | 181 | ||
| 184 | all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS} | 182 | all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} |
| 185 | 183 | ||
| 186 | LOADLIBES = ../lib/libgnu.a $(LIBS_SYSTEM) | 184 | LOADLIBES = ../lib/libgnu.a $(LIBS_SYSTEM) |
| 187 | $(EXE_FILES): ../lib/libgnu.a | 185 | $(EXE_FILES): ../lib/libgnu.a |
| 188 | 186 | ||
| 189 | ## These targets copy the scripts into the build directory so that | ||
| 190 | ## they can be run from there in an uninstalled Emacs. | ||
| 191 | ## Nothing to do if pwd = srcdir. | ||
| 192 | insrcdir=[ "`/bin/pwd`" = "`cd $(srcdir) && /bin/pwd`" ] | ||
| 193 | |||
| 194 | stamp-rcs2log: $(srcdir)/rcs2log | ||
| 195 | $(insrcdir) || cp -p $(srcdir)/rcs2log rcs2log | ||
| 196 | touch $@ | ||
| 197 | |||
| 198 | stamp-grep-changelog: $(srcdir)/grep-changelog | ||
| 199 | $(insrcdir) || cp -p $(srcdir)/grep-changelog grep-changelog | ||
| 200 | touch $@ | ||
| 201 | |||
| 202 | ## Only used if we need blessmail, but no harm in always defining. | 187 | ## Only used if we need blessmail, but no harm in always defining. |
| 203 | ## This makes the actual blessmail executable. | 188 | ## This makes the actual blessmail executable. |
| 204 | blessmail: | 189 | blessmail: |
| @@ -273,7 +258,6 @@ mostlyclean: | |||
| 273 | 258 | ||
| 274 | clean: mostlyclean | 259 | clean: mostlyclean |
| 275 | -rm -f ${EXE_FILES} | 260 | -rm -f ${EXE_FILES} |
| 276 | -rm -f ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS} | ||
| 277 | 261 | ||
| 278 | distclean: clean | 262 | distclean: clean |
| 279 | -rm -f TAGS | 263 | -rm -f TAGS |