[Emacs-diffs] /srv/bzr/emacs/trunk r100412: Remove cirsular dependency when using separate build dir (Bug #6246).

[Jan D.]

------------------------------------------------------------
revno: 100412
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sat 2010-05-22 13:59:09 +0200
message:
  Remove cirsular dependency when using separate build dir (Bug #6246).
  
   * Makefile.in (STAMP_INST_SCRIPTS, STAMP_SCRIPS): New (Bug #6246).
   (all): Depend onSTAMP_INST_SCRIPTS, STAMP_SCRIPS (Bug #6246).
   (stamp-rcs2log, stamp-rcs-checkin, stamp-grep-changelog, stamp-vcdiff):
   New rules (Bug #6246).
   (clean): Remove stamp-* (Bug #6246).
modified:
  lib-src/ChangeLog
  lib-src/Makefile.in

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2010-05-12 03:06:50 +0000
+++ b/lib-src/ChangeLog 2010-05-22 11:59:09 +0000
@@ -1,3 +1,11 @@
+2010-05-22  Jan Djärv  <address@hidden>
+
+       * Makefile.in (STAMP_INST_SCRIPTS, STAMP_SCRIPS): New (Bug #6246).
+       (all): Depend onSTAMP_INST_SCRIPTS, STAMP_SCRIPS (Bug #6246).
+       (stamp-rcs2log, stamp-rcs-checkin, stamp-grep-changelog, stamp-vcdiff):
+       New rules (Bug #6246).
+       (clean): Remove stamp-* (Bug #6246).
+
 2010-05-12  Glenn Morris  <address@hidden>
 
        * Makefile.in (INSTALLABLES): Remove @address@hidden

=== modified file 'lib-src/Makefile.in'
--- a/lib-src/Makefile.in       2010-05-15 01:05:11 +0000
+++ b/lib-src/Makefile.in       2010-05-22 11:59:09 +0000
@@ -111,6 +111,7 @@
                b2m${EXEEXT} ebrowse${EXEEXT}
 
 INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog
+STAMP_INST_SCRIPTS = stamp-rcs-checkin stamp-grep-changelog
 
 # Things that Emacs runs internally, or during the build process,
 #  which should not be installed in bindir.
@@ -123,6 +124,7 @@
 # Like UTILITIES, but they're not system-dependent, and should not be
 #  deleted by the distclean target.
 SCRIPTS= rcs2log vcdiff
+STAMP_SCRIPTS= stamp-rcs2log stamp-vcdiff
 
 EXECUTABLES= ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
 
@@ -180,23 +182,27 @@
 .c.o:
        ${CC} -c ${CPP_CFLAGS} $<
 
-all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} 
${INSTALLABLE_SCRIPTS}
+all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} 
${INSTALLABLE_SCRIPTS}  ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS}
 
 ## These targets copy the scripts into the build directory so that
 ## they can be run from there in an uninstalled Emacs.
 ## The "-" is prepended because some versions of cp barf when srcdir
 ## is the current directory, and thus the file will be copied into itself.
-rcs2log: $(srcdir)/rcs2log
+stamp-rcs2log: $(srcdir)/rcs2log
        -cp -p $(srcdir)/rcs2log rcs2log
+       touch $@
 
-rcs-checkin: $(srcdir)/rcs-checkin
+stamp-rcs-checkin: $(srcdir)/rcs-checkin
        -cp -p $(srcdir)/rcs-checkin rcs-checkin
+       touch $@
 
-grep-changelog: $(srcdir)/grep-changelog
+stamp-grep-changelog: $(srcdir)/grep-changelog
        -cp -p $(srcdir)/grep-changelog grep-changelog
+       touch $@
 
-vcdiff: $(srcdir)/vcdiff
+stamp-vcdiff: $(srcdir)/vcdiff
        -cp -p $(srcdir)/vcdiff vcdiff
+       touch $@
 
 ## Only used if we need blessmail, but no harm in always defining.
 ## This makes the actual blessmail executable.
@@ -273,7 +279,7 @@
 
 clean: mostlyclean
        -rm -f ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL}
-       -rm -f fns*.el *.tab.c *.tab.h
+       -rm -f fns*.el *.tab.c *.tab.h stamp-*
 
 distclean: clean
        -rm -f TAGS