Re: amtraces

[Derek R. Price]

"Derek R. Price" wrote:

> Tom Tromey wrote:
>
> > >>>>> "Derek" == Derek R Price <address@hidden> writes:
> >
> > Derek> From comp-vars.am:
> > Derek> DEFS = @DEFS@@DEFAULT_INCLUDES@
> >
> > Ok, thanks.
> > This is definitely an automake bug.
> > Your proposed fix sounds ok to me.
>
> Patch included.

Whoops.  Here's the patch for real.

Akim, what is the naming scheme you  are using for patches.  Should I be trying 
to
use something similar?

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:address@hidden     OpenAvenue ( http://OpenAvenue.com )
--
The man who reads nothing at all is better educated than the man who reads
nothing but newspapers.

                        - Thomas Jefferson (1743-1826)


? automake-DEFAULT_INCLUDES.diff
Index: ChangeLog
===================================================================
RCS file: /cvs/automake/ChangeLog,v
retrieving revision 1.974
diff -u -r1.974 ChangeLog
--- ChangeLog   2001/02/03 05:56:40     1.974
+++ ChangeLog   2001/02/03 22:15:22
@@ -1,3 +1,10 @@
+2001-02-03  Derek Price  <address@hidden>
+
+       * automake.in (globals): add $(DEFAULT_INCLUDES) to all the COMPILE
+       definitions which contain DEFS
+       (lang_c_finish): ditto for ansi2kr _.c target
+       * comp-vars.am: separate DEFS & DEFAULT_INCLUDES definitions
+
 2001-02-02  Gordon Sadler <address@hidden>
 
        * automake.texi (Java Support): Added index, @section.
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake.in,v
retrieving revision 1.848
diff -u -r1.848 automake.in
--- automake.in 2001/02/02 15:10:13     1.848
+++ automake.in 2001/02/03 22:15:26
@@ -341,18 +341,18 @@
 &initialize_global_constants;
 
 &register_language ('c', 'ansi-p=1', 'autodep=', 'flags=CFLAGS',
-                   'compile=$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)',
+                   'compile=$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)',
                    'compiler-name=COMPILE',
                    'output-arg=-c',
                    'c');
 &register_language ('cxx', 'linker=CXXLINK', 'autodep=CXX', 'flags=CXXFLAGS',
-                   'compile=$(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)',
+                   'compile=$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)',
                    'compiler-name=CXXCOMPILE',
                    'output-arg=-c -o $@',
                    'c++', 'cc', 'cpp', 'cxx', 'C');
 &register_language ('objc', 'linker=OBJCLINK', 'autodep=OBJC',
                    'flags=OBJCFLAGS',
-                   'compile=$(OBJC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)',
+                   'compile=$(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)',
                    'compiler-name=OBJCCOMPILE',
                    'output-arg=-c -o $@',
                     'm');
@@ -371,7 +371,7 @@
 
 &register_language ('asm',
                    'flags=CFLAGS', # FIXME: asmflags?
-                   'compile=$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)', # FIXME: a different compiler?
+                   'compile=$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)', # FIXME: a different 
compiler?
                    'compiler-name=COMPILE',
                    'output-arg=-c',
                    's', 'S');
@@ -382,7 +382,7 @@
                    'output-arg=-c -o $@',
                    'f', 'for', 'f90');
 &register_language ('ppf77', 'linker=F77LINK', 'flags=FFLAGS',
-                   'compile=$(F77) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)',
+                   'compile=$(F77) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)',
                    'compiler-name=PPF77COMPILE',
                    'output-arg=-c -o $@',
                    'F');
@@ -395,7 +395,7 @@
 # FIXME: for now we can't do dependency tracking for Java.
 # autodep=GCJ
 &register_language ('java', 'linker=GCJLINK', 'flags=GCJFLAGS',
-                   'compile=$(GCJ) $(DEFS) $(INCLUDES) $(AM_GCJFLAGS) 
$(GCJFLAGS)',
+                   'compile=$(GCJ) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_GCJFLAGS) $(GCJFLAGS)',
                    'compiler-name=GCJCOMPILE',
                    'output-arg=-c -o $@',
                    'java', 'class', 'zip', 'jar');
@@ -5065,7 +5065,7 @@
            # we can't use $< -- some makes only define $< during a
            # suffix rule.
            $output_rules .= ($base . "_.c: $base.c \$(ANSI2KNR)\n\t"
-                             . '$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) '
+                             . '$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) '
                              . '`if test -f $(srcdir)/' . $base . '.c'
                              . '; then echo $(srcdir)/' . $base . '.c'
                              . '; else echo ' . $base . '.c; fi` '
@@ -5262,7 +5262,7 @@
 # Preprocessed Fortran 77
 #
 # The current support for preprocessing Fortran 77 just involves passing
-# `$(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)' as additional flags
+# `$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)' as 
additional flags
 # to the Fortran 77 compiler, since this is how GNU Make does it; see
 # the `GNU Make Manual, Edition 0.51 for `make' Version 3.76 Beta'
 # (specifically, from info file `(make)Catalogue of Rules').
Index: comp-vars.am
===================================================================
RCS file: /cvs/automake/comp-vars.am,v
retrieving revision 1.4
diff -u -r1.4 comp-vars.am
--- comp-vars.am        2000/10/16 09:01:36     1.4
+++ comp-vars.am        2001/02/03 22:15:26
@@ -16,7 +16,11 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-DEFS = @DEFS@@DEFAULT_INCLUDES@
+DEFAULT_INCLUDES = @DEFAULT_INCLUDES@
+## FIXME TRACES - The following four definitions should happen automatically
+## with the traces code, but we need them as long as the old file scanning
+## method is still enabled)
+DEFS = @DEFS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@