Various bug fixes

diff --git a/ChangeLog b/ChangeLog
index 800ce8ce1994f8c52dc51c90e1fa3b7d8cef75c4..b3a7625f34b88d9d5aeaac7b5742604b9791aee6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Thu Oct 10 16:12:38 1996  Tom Tromey  <tromey@cygnus.com>
+
+       * remake.am (Makefile): Depend on BUILT_SOURCES.
+       * remake-subd.am (Makefile): Depend on BUILT_SOURCES.
+       * depend.am (.deps/.P): Don't depend on BUILT_SOURCES.
+
+       * automake.in (handle_yacc_lex_cxx): Handle y.tab.h in non-ylwrap
+       case.
+
+       * ylwrap: Bug fix.  From Jim Meyering.
+
+Wed Oct  9 22:51:16 1996  Tom Tromey  <tromey@cygnus.com>
+
+       * m4/mktime.m4: Don't define AC_HEADER_SYS_TIME_H; instead just
+       check directly for header.
+
 Mon Oct  7 13:08:15 1996  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (scan_configure): fp_WITH_DMALLOC and fp_WITH_REGEX

diff --git a/THANKS b/THANKS
index 5f0d3eb52641711f4b6742ed40686cce09f304ac..3aeb619f9d212fa42fbf914636e694c7effa2d87 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -17,7 +17,7 @@ Janos Farkas <chexum@shadow.banki.hu>
 Jason Molenda <crash@cygnus.co.jp>
 Jerome Santini <santini@chambord.univ-orleans.fr>
 Jim Meyering <meyering@na-net.ornl.gov>
-Joel N. Weber II" <nemo@koa.iolani.honolulu.hi.us>
+Joel N. Weber II <nemo@koa.iolani.honolulu.hi.us>
 Joerg-Martin Schwarz <jms@jms.prima.ruhr.de>
 Josh MacDonald <jmacd@cs.berkeley.edu>
 Joshua Cowan <jcowan@jcowan.reslife.okstate.edu>

diff --git a/TODO b/TODO
index 824d1cff130c6c4ffdd01d9fba8f148529013312..e66bf31b82a0af2617194a9aaefeb7e999476673 100644 (file)
--- a/TODO
+++ b/TODO
@@ -5,6 +5,9 @@ Priorities for release:
 * `missing' program
 * copyrights on m4 files, aclocal output
 
+* BUILT_SOURCES should be examined by automake, %dep_files should be
+  updated to handle it.
+
 Further:
 - texinfo/info changes
 - Per's suggestion
@@ -63,8 +66,6 @@ Per> .class files from a list of .java source files.
   certain part of the standards apply.  saw idea in message from
   Craig Burley.
 
-* patch from Joel Weber about fixing yacc; in particular generating .h file
-
 !! should write autoconf-style doc entries for each m4 macro
 
 Jim's idea: should look for @setfilename and warn if filenames too long

diff --git a/automake.in b/automake.in
index 03f169531874e192954835a7a02a8cf620102e77..c4db39c7e110c1209bff9b6b9a0cb605d68faa1a 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -677,7 +677,8 @@ sub handle_yacc_lex_cxx
        }
        else
        {
-           $output_rules .= '$(YACC) $(YFLAGS) $< && mv y.tab.c $@';
+           $output_rules .= ('$(YACC) $(YFLAGS) $< && mv y.tab.c $@' . "\n\t"
+                             . 'if test -f y.tab.h; then mv y.tab.h $*.h; else :; fi');
        }
        $output_rules .= "\n";
 

diff --git a/depend.am b/depend.am
index 32ffb04335c524d9e18ae3b307ae070d2eeca4c6..b17b96031fbbd38b4cff7482112aba30023aea44 100644 (file)
--- a/depend.am
+++ b/depend.am
@@ -26,7 +26,7 @@ MKDEP = gcc -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 ## duplicated by any C source file.  (Well, there could be ".c", but
 ## no one does that in practice)
 -include .deps/.P
-.deps/.P: $(BUILT_SOURCES)
+.deps/.P:
        test -d .deps || mkdir .deps
 ## Use ":" here and not "echo timestamp".  Otherwise GNU Make barfs:
 ## .deps/.P:1: *** missing separator.  Stop.

diff --git a/lib/am/depend.am b/lib/am/depend.am
index 32ffb04335c524d9e18ae3b307ae070d2eeca4c6..b17b96031fbbd38b4cff7482112aba30023aea44 100644 (file)
--- a/lib/am/depend.am
+++ b/lib/am/depend.am
@@ -26,7 +26,7 @@ MKDEP = gcc -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 ## duplicated by any C source file.  (Well, there could be ".c", but
 ## no one does that in practice)
 -include .deps/.P
-.deps/.P: $(BUILT_SOURCES)
+.deps/.P:
        test -d .deps || mkdir .deps
 ## Use ":" here and not "echo timestamp".  Otherwise GNU Make barfs:
 ## .deps/.P:1: *** missing separator.  Stop.

diff --git a/lib/ylwrap b/lib/ylwrap
index 9a484df82d0a6313a95ca1dcb67eda3009c73abb..5b47e055117f54d689310b05ff29961a57bece15 100755 (executable)
--- a/lib/ylwrap
+++ b/lib/ylwrap
@@ -43,7 +43,7 @@ set X $pairlist
 shift
 status=0
 first=yes
-while "$#" -ne 0; do
+while test "$#" -ne 0; do
    if test -f "$1"; then
       mv "$1" "$2" || status=$?
    else

diff --git a/m4/mktime.m4 b/m4/mktime.m4
index 9a5e63ffbe56ff4526fda985784aa03b68bd898d..3f03b1e0c4a72ce6d366c320f5ef136bd0c2360c 100644 (file)
--- a/m4/mktime.m4
+++ b/m4/mktime.m4
@@ -1,14 +1,9 @@
 dnl From Jim Meyering.
 dnl FIXME: this should migrate into libit.
 
-dnl This little macro is solely so AM_FUNC_MKTIME can require
-dnl that AC_CHECK_HEADERS(sys/time.h) has been run.
-AC_DEFUN(AC_HEADER_SYS_TIME_H,
- [AC_CHECK_HEADERS(sys/time.h)])
-
 AC_DEFUN(AM_FUNC_MKTIME,
 [AC_REQUIRE([AC_HEADER_TIME])dnl
- AC_REQUIRE([AC_HEADER_SYS_TIME_H])dnl
+ AC_CHECK_HEADERS(sys/time.h)
  AC_CACHE_CHECK([for working mktime], am_cv_func_working_mktime,
   [AC_TRY_RUN([/* Test program from Tony Leneis (tony@plaza.ds.adp.com).  */
 #if TIME_WITH_SYS_TIME

diff --git a/remake-subd.am b/remake-subd.am
index 2f318d7e14caf45fa157671a43d99fdc5a261c27..76db4675b8a1b0e55698a44d4a4474dffa665237 100644 (file)
--- a/remake-subd.am
+++ b/remake-subd.am
@@ -18,5 +18,5 @@
 $(srcdir)/Makefile.in: @MAINT@Makefile.am $(top_srcdir)/configure.in
        cd $(top_srcdir) && automake $(subdir)/Makefile
 
-Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in
+Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in $(BUILT_SOURCES)
        cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status

diff --git a/remake.am b/remake.am
index 2a5ba0fd9c0f34394724e97f733ad76f4c9d3eaf..948ec960d02adb2bb6d5b39a7adcfcd814ef4a02 100644 (file)
--- a/remake.am
+++ b/remake.am
@@ -20,7 +20,7 @@ $(srcdir)/Makefile.in: @MAINT@Makefile.am configure.in
 
 # For an explanation of the following Makefile rules, see node
 # `Automatic Remaking' in GNU Autoconf documentation.
-Makefile: $(srcdir)/Makefile.in config.status
+Makefile: $(srcdir)/Makefile.in config.status $(BUILT_SOURCES)
        CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
 config.status: configure
        ./config.status --recheck

diff --git a/ylwrap b/ylwrap
index 9a484df82d0a6313a95ca1dcb67eda3009c73abb..5b47e055117f54d689310b05ff29961a57bece15 100755 (executable)
--- a/ylwrap
+++ b/ylwrap
@@ -43,7 +43,7 @@ set X $pairlist
 shift
 status=0
 first=yes
-while "$#" -ne 0; do
+while test "$#" -ne 0; do
    if test -f "$1"; then
       mv "$1" "$2" || status=$?
    else