From c88b05a9d69ee8d35e408d70a80538fdd13f1a3d Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Mon, 10 May 2010 20:18:58 -0700
Subject: [PATCH] Minor lib-src/Makefile.in edits.

* lib-src/Makefile.in (.m.o): Remove, there are no .m files.
(BASE_CFLAGS): New variable.
(ALL_CFLAGS, LINK_CFLAGS, CPP_CFLAGS): Use $BASE_CFLAGS.
(check): Update the message.
(update-game-score${EXEEXT}): Do not use $MOVE_FLAGS.
---
 lib-src/ChangeLog   |  6 ++++++
 lib-src/Makefile.in | 17 +++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index c9a054b9e2..64cc3dde93 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,5 +1,11 @@
 2010-05-11  Glenn Morris  <rgm@gnu.org>
 
+	* Makefile.in (.m.o): Remove, there are no .m files.
+	(BASE_CFLAGS): New variable.
+	(ALL_CFLAGS, LINK_CFLAGS, CPP_CFLAGS): Use $BASE_CFLAGS.
+	(check): Update the message.
+	(update-game-score${EXEEXT}): Do not use $MOVE_FLAGS.
+
 	* Makefile.in: Convert comments to makefile format.
 
 	* Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index a2773aa916..c8f9042f9f 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -161,15 +161,15 @@ LIBS_SYSTEM = @LIBS_SYSTEM@
 # Those files shared with other GNU utilities need HAVE_CONFIG_H
 # defined before they know they can take advantage of the information
 # in ../src/config.h.
-ALL_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
-LINK_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CFLAGS}
-CPP_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src ${CPPFLAGS} ${CFLAGS}
+BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src
+
+ALL_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
+LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS}
+CPP_CFLAGS = ${BASE_CFLAGS} ${CPPFLAGS} ${CFLAGS}
 
 LOADLIBES=$(LIBS_SYSTEM)
 
 
-.SUFFIXES: .m
-
 ## This is the default compilation command.
 ## But we should never rely on it, because some make version failed to
 ## find it for getopt.o.
@@ -177,9 +177,6 @@ LOADLIBES=$(LIBS_SYSTEM)
 .c.o:
 	${CC} -c ${CPP_CFLAGS} $<
 
-.m.o:
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
-
 all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
 
 ## These targets copy the scripts into the build directory so that
@@ -287,7 +284,7 @@ extraclean: maintainer-clean
 
 ## Test the contents of the directory.
 check:
-	@echo "We don't have any tests for GNU Emacs yet."
+	@echo "We don't have any tests for the lib-src/ directory yet."
 
 tags: TAGS
 TAGS: etags${EXEEXT}
@@ -370,7 +367,7 @@ hexl${EXEEXT}: ${srcdir}/hexl.c ../src/config.h
 	$(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl
 
 update-game-score${EXEEXT}: update-game-score.o $(GETOPTDEPS)
-	$(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} update-game-score.o $(GETOPTOBJS) $(LOADLIBES) -o update-game-score
+	$(CC) ${LINK_CFLAGS} update-game-score.o $(GETOPTOBJS) $(LOADLIBES) -o update-game-score
 
 update-game-score.o: ${srcdir}/update-game-score.c ../src/config.h $(GETOPT_H)
 	$(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \
-- 
2.20.1