* automake.in (am_install_var): Added -noextra option.

	(handle_data): Pass -noextra to am_install_var.

diff --git a/ChangeLog b/ChangeLog
index ef18d1666fc6348afeb9ed640dfd8133f086f948..088f685a8aef33859da526c09793a7294c2acdab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+1998-10-07  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (am_install_var): Added -noextra option.
+       (handle_data): Pass -noextra to am_install_var.
+
+Sun Oct  4 22:24:10 1998  Tom Tromey  <tromey@cygnus.com>
+
+       * m4/winsz.m4 (AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL): Use
+       3-argument form of AC_DEFINE.
+       * m4/regex.m4 (AM_WITH_REGEX): Use 3-argument form of AC_DEFINE.
+       * m4/ptrdiff.m4 (AM_TYPE_PTRDIFF_T): Use 3-argument form of
+       AC_DEFINE.
+       * m4/protos.m4 (AM_C_PROTOTYPES):Use 3-argument form of
+       AC_DEFINE.
+       * m4/obstack.m4 (AM_FUNC_OBSTACK): Use 3-argument form of
+       AC_DEFINE.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Use 3-argument form of
+       AC_DEFINE.
+       * m4/dmalloc.m4 (AM_WITH_DMALLOC): Use 3-argument form of
+       AC_DEFINE.
+
 Tue Oct  6 00:02:15 1998  Tom Tromey  <tromey@cygnus.com>
 
        * depend2.am (%.lo): Handle case where compiler does not put space

diff --git a/TODO b/TODO
index 1d066a6b017e885f655df47cfb714c90ff7d9e46..53aeb35b39649c04c1bd95a71a24315c539b9ede 100644 (file)
--- a/TODO
+++ b/TODO
@@ -23,14 +23,6 @@
        LL_info_TEXINFOS = ...
   will put info files for language LL into $(infodir)/LL.
 
-* dependency tracking doesn't work well when a file is removed
-  the new code to track header dependencies exacerbates this
-  what is the fix?
-  ANSWER: for each dependency foo.h, make a dummy target `foo.h:'
-  in the .P file.  Then the right thing ought to happen
-  [ No, that won't work if the .h file is auto-generated
-    instead must rely on a fix in make ]
-
 * If you suppress an internal variable by specifying a variable
   in a Makefile.am, but the variable is conditional, then automake
   should generate the internal variable conditionally.
@@ -473,6 +465,20 @@ move discussion of cygwin32, etags, mkid under other gnu tools
 
 ================================================================
 
+Things to do for gcc:
+
+Regularize dependency generation.  Add new flags:
+
+-MH   Generate a dummy dependency for each header file mentioned.
+-MT NAME
+      Set name of target
+-MF NAME
+      Set name of output file
+
+Then automake can use -MD -MH -MT 'foo.o foo.lo' -MF .deps/...
+
+================================================================
+
 Things to do for autoconf:
 
 * patch autoreconf to run automake and aclocal.  I've done this but it is

diff --git a/automake.in b/automake.in
index 062c734353d77ba373543c2b56a027ae8d7fa5cd..9c138d17f05802a047ff9e3256e10514fd994933 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2139,7 +2139,7 @@ sub handle_man_pages
 # Handle DATA variables.
 sub handle_data
 {
-    &am_install_var ('data', 'DATA', 'data', 'sysconf',
+    &am_install_var ('-noextra', 'data', 'DATA', 'data', 'sysconf',
                     'sharedstate', 'localstate', 'pkgdata',
                     'noinst', 'check');
 }
@@ -6155,6 +6155,7 @@ sub am_install_var
     local (@args) = @_;
 
     local ($do_clean) = 0;
+    local ($do_require) = 1;
 
     local ($ltxform);
     if (defined $configure_vars{'LIBTOOL'})
@@ -6184,6 +6185,10 @@ sub am_install_var
        {
            $do_clean = 1;
        }
+       elsif ($args[0] eq '-noextra')
+       {
+           $do_require = 0;
+       }
        elsif ($args[0] !~ /^-/)
        {
            last;
@@ -6241,8 +6246,15 @@ sub am_install_var
                        if (! $warned_about_extra)
                        {
                            $warned_about_extra = 1;
-                           &am_line_error ($one_name,
-                                           "\`$one_name' contains configure substitution, but shouldn't");
+                           if (! $do_require)
+                           {
+                               &am_line_error ($one_name, "\`$one_name' should not be defined");
+                           }
+                           else
+                           {
+                               &am_line_error ($one_name,
+                                               "\`$one_name' contains configure substitution, but shouldn't");
+                           }
                        }
                    }
                    # Check here to make sure variables defined in
@@ -6250,7 +6262,8 @@ sub am_install_var
                    # must be defined.
                    elsif (! defined $configure_vars{$one_name})
                    {
-                       $require_extra = $one_name;
+                       $require_extra = $one_name
+                           if $do_require;
                    }
 
                    next;