[Emacs-diffs] /srv/bzr/emacs/trunk r104360: Tiny simplifications in lib-src/Makfile.in

[Glenn Morris]

------------------------------------------------------------
revno: 104360
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2011-05-24 21:23:14 -0400
message:
  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.
modified:
  lib-src/ChangeLog
  lib-src/Makefile.in

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2011-05-24 03:43:17 +0000
+++ b/lib-src/ChangeLog 2011-05-25 01:23:14 +0000
@@ -1,3 +1,8 @@
+2011-05-25  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * Makefile.in (update-game-score${EXEEXT}): Use a single rule.

=== modified file 'lib-src/Makefile.in'
--- a/lib-src/Makefile.in       2011-05-24 03:43:17 +0000
+++ b/lib-src/Makefile.in       2011-05-25 01:23:14 +0000
@@ -313,17 +313,14 @@
 ../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 @@
 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