Commit 4e3028f8 authored by Jan Djärv's avatar Jan Djärv
Browse files

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).
parent a9641610
2010-05-22 Jan Djärv <jan.h.d@swipnet.se>
* 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 <rgm@gnu.org> 2010-05-12 Glenn Morris <rgm@gnu.org>
* Makefile.in (INSTALLABLES): Remove @LIB_SRC_EXTRA_INSTALLABLES@. * Makefile.in (INSTALLABLES): Remove @LIB_SRC_EXTRA_INSTALLABLES@.
......
...@@ -111,6 +111,7 @@ INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} \ ...@@ -111,6 +111,7 @@ INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} \
b2m${EXEEXT} ebrowse${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT}
INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog 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, # Things that Emacs runs internally, or during the build process,
# which should not be installed in bindir. # which should not be installed in bindir.
...@@ -123,6 +124,7 @@ DONT_INSTALL= test-distrib${EXEEXT} make-docfile${EXEEXT} ...@@ -123,6 +124,7 @@ DONT_INSTALL= test-distrib${EXEEXT} make-docfile${EXEEXT}
# Like UTILITIES, but they're not system-dependent, and should not be # Like UTILITIES, but they're not system-dependent, and should not be
# deleted by the distclean target. # deleted by the distclean target.
SCRIPTS= rcs2log vcdiff SCRIPTS= rcs2log vcdiff
STAMP_SCRIPTS= stamp-rcs2log stamp-vcdiff
EXECUTABLES= ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} EXECUTABLES= ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
...@@ -180,23 +182,27 @@ LOADLIBES=$(LIBS_SYSTEM) ...@@ -180,23 +182,27 @@ LOADLIBES=$(LIBS_SYSTEM)
.c.o: .c.o:
${CC} -c ${CPP_CFLAGS} $< ${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 ## These targets copy the scripts into the build directory so that
## they can be run from there in an uninstalled Emacs. ## they can be run from there in an uninstalled Emacs.
## The "-" is prepended because some versions of cp barf when srcdir ## The "-" is prepended because some versions of cp barf when srcdir
## is the current directory, and thus the file will be copied into itself. ## 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 -cp -p $(srcdir)/rcs2log rcs2log
touch $@
rcs-checkin: $(srcdir)/rcs-checkin stamp-rcs-checkin: $(srcdir)/rcs-checkin
-cp -p $(srcdir)/rcs-checkin 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 -cp -p $(srcdir)/grep-changelog grep-changelog
touch $@
vcdiff: $(srcdir)/vcdiff stamp-vcdiff: $(srcdir)/vcdiff
-cp -p $(srcdir)/vcdiff vcdiff -cp -p $(srcdir)/vcdiff vcdiff
touch $@
## Only used if we need blessmail, but no harm in always defining. ## Only used if we need blessmail, but no harm in always defining.
## This makes the actual blessmail executable. ## This makes the actual blessmail executable.
...@@ -273,7 +279,7 @@ mostlyclean: ...@@ -273,7 +279,7 @@ mostlyclean:
clean: mostlyclean clean: mostlyclean
-rm -f ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL} -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 distclean: clean
-rm -f TAGS -rm -f TAGS
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment