From 7bdede3f5e21e94de5ec26b73971c3a9697cc99b Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 24 May 2011 21:23:14 -0400 Subject: [PATCH] Tiny simplifications in lib-src/Makfile.in * lib-src/Makfile.in (REGEXPOBJ, REGEXPDEPS): Remove. Replace by expansion. (etags${EXEEXT}): Just depend on regex.o, not regex.h as well. --- lib-src/ChangeLog | 5 +++++ lib-src/Makefile.in | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 13231f2c8db..7d4a19fedc9 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2011-05-25 Glenn Morris + + * Makefile.in (REGEXPOBJ, REGEXPDEPS): Remove. Replace by expansion. + (etags${EXEEXT}): Just depend on regex.o, not regex.h as well. + 2011-05-24 Glenn Morris * Makefile.in (update-game-score${EXEEXT}): Use a single rule. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 24d89606195..5c9a62a2c56 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -313,17 +313,14 @@ test-distrib${EXEEXT}: ${srcdir}/test-distrib.c ../lib/libgnu.a: ../src/config.h cd ../lib && $(MAKE) libgnu.a -REGEXPOBJ = regex.o -REGEXPDEPS = $(REGEXPOBJ) $(srcdir)/../src/regex.h - regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h ../src/config.h ${CC} -c ${CPP_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \ ${srcdir}/../src/regex.c -etags${EXEEXT}: ${srcdir}/etags.c $(REGEXPDEPS) ../src/config.h +etags${EXEEXT}: ${srcdir}/etags.c regex.o ../src/config.h $(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" \ -DVERSION="\"${version}\"" ${srcdir}/etags.c \ - $(REGEXPOBJ) $(LOADLIBES) -o etags + regex.o $(LOADLIBES) -o etags ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h ../src/config.h $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \ @@ -334,7 +331,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h ../src/config.h ctags${EXEEXT}: etags${EXEEXT} $(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \ -DVERSION="\"${version}\"" ${srcdir}/etags.c \ - $(REGEXPOBJ) $(LOADLIBES) -o ctags + regex.o $(LOADLIBES) -o ctags profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile -- 2.39.2