From: Glenn Morris <rgm@gnu.org>
Date: Wed, 25 May 2011 02:33:35 +0000 (-0700)
Subject: Small further clean-up in lib-src/Makefile.in
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~166
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e949074338d3f5ccc7475721c7421eef6aea68d4;p=emacs.git

Small further clean-up in lib-src/Makefile.in

* lib-src/Makefile.in (.c.o): Remove (every .o file has an explicit rule).
(insrcdir): New.
(stamp-rcs2log, stamp-rcs-checkin, stamp-grep-changelog, stamp-vcdiff):
Use $insrcdir to suppress unaesthetic ignored errors.
(clean): Simplify list of things to delete.
---

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index a7cbeba8227..d404518c077 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,5 +1,11 @@
 2011-05-25  Glenn Morris  <rgm@gnu.org>
 
+	* Makefile.in (.c.o): Remove (every .o file has an explicit rule).
+	(insrcdir): New.
+	(stamp-rcs2log, stamp-rcs-checkin, stamp-grep-changelog, stamp-vcdiff):
+	Use $insrcdir to suppress unaesthetic ignored errors.
+	(clean): Simplify list of things to delete.
+
 	* Makefile.in (movemail${EXEEXT}): Build in one step, not via .o file.
 
 	* Makefile.in (REGEXPOBJ, REGEXPDEPS): Remove.  Replace by expansion.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index a7f224a31ac..2b9ef010e5e 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -178,33 +178,27 @@ CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS}
 LOADLIBES = ../lib/libgnu.a $(LIBS_SYSTEM)
 $(EXE_FILES): ../lib/libgnu.a
 
-## This is the default compilation command.
-## But we should never rely on it, because some make version failed to
-## find it for getopt.o.
-## Using an explicit command made it work.
-.c.o:
-	${CC} -c ${CPP_CFLAGS} $<
-
 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.
+## Nothing to do if pwd = srcdir.
+insrcdir=[ "`/bin/pwd`" = "`(cd $(srcdir) && /bin/pwd)`" ]
+
 stamp-rcs2log: $(srcdir)/rcs2log
-	-cp -p $(srcdir)/rcs2log rcs2log
+	$(insrcdir) || cp -p $(srcdir)/rcs2log rcs2log
 	touch $@
 
 stamp-rcs-checkin: $(srcdir)/rcs-checkin
-	-cp -p $(srcdir)/rcs-checkin rcs-checkin
+	$(insrcdir) || cp -p $(srcdir)/rcs-checkin rcs-checkin
 	touch $@
 
 stamp-grep-changelog: $(srcdir)/grep-changelog
-	-cp -p $(srcdir)/grep-changelog grep-changelog
+	$(insrcdir) || cp -p $(srcdir)/grep-changelog grep-changelog
 	touch $@
 
 stamp-vcdiff: $(srcdir)/vcdiff
-	-cp -p $(srcdir)/vcdiff vcdiff
+	$(insrcdir) || cp -p $(srcdir)/vcdiff vcdiff
 	touch $@
 
 ## Only used if we need blessmail, but no harm in always defining.
@@ -282,7 +276,7 @@ mostlyclean:
 
 clean: mostlyclean
 	-rm -f ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL}
-	-rm -f fns*.el *.tab.c *.tab.h stamp-*
+	-rm -f ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS}
 
 distclean: clean
 	-rm -f TAGS