# HG changeset patch # User Glenn Morris # Date 1273547938 25200 # Node ID cea42c2d79829fd5b84b583a69acc38ba1bd5a75 # Parent 7303923cef2255ff7e09eafe291bfffae0dd009a 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. diff -r 7303923cef22 -r cea42c2d7982 lib-src/ChangeLog --- a/lib-src/ChangeLog Mon May 10 20:10:36 2010 -0700 +++ b/lib-src/ChangeLog Mon May 10 20:18:58 2010 -0700 @@ -1,5 +1,11 @@ 2010-05-11 Glenn Morris + * 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 -r 7303923cef22 -r cea42c2d7982 lib-src/Makefile.in --- a/lib-src/Makefile.in Mon May 10 20:10:36 2010 -0700 +++ b/lib-src/Makefile.in Mon May 10 20:18:58 2010 -0700 @@ -161,15 +161,15 @@ # 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 @@ .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 @@ ## 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 @@ $(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 \