diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/Makefile.am | 6 | ||||
| -rw-r--r-- | gas/Makefile.in | 7 |
3 files changed, 8 insertions, 10 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 35820b0bab..d4fdd631a4 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,10 @@ 2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + * Makefile.am (YFLAGS): Remove, not needed any more. + (AM_CPPFLAGS): Renamed from ... + (INCLUDES): ... this. + * Makefile.in: Regenerate. + * Makefile.am (AUTOMAKE_OPTIONS): Remove 1.8 cygnus, add 1.11, foreign and no-dist. (all): Remove now-unneeded dependency upon info. diff --git a/gas/Makefile.am b/gas/Makefile.am index 177e7f32fb..a3adf0b720 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -10,10 +10,6 @@ tooldir = $(exec_prefix)/$(target_alias) YACC = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo @YACC@ ; fi` LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex ; else echo @LEX@ ; fi` -# We have to set this, because autoconf 2.59 does not substitute YFLAGS. -# Autoconf 2.61 does, so this can be removed when we upgrade. -YFLAGS = - WARN_CFLAGS = @WARN_CFLAGS@ NO_WERROR = @NO_WERROR@ AM_CFLAGS = $(WARN_CFLAGS) @@ -510,7 +506,7 @@ INCDIR = $(BASEDIR)/include # Both . and srcdir are used, in that order, # so that tm.h and config.h will be found in the compilation # subdirectory rather than in the source directory. -INCLUDES = -I. -I$(srcdir) -I../bfd -I$(srcdir)/config \ +AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(srcdir)/config \ -I$(INCDIR) -I$(srcdir)/.. -I$(BFDDIR) @INCINTL@ \ -DLOCALEDIR="\"$(datadir)/locale\"" diff --git a/gas/Makefile.in b/gas/Makefile.in index 64cd83d74c..f385064b17 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -212,10 +212,7 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ XGETTEXT = @XGETTEXT@ YACC = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo @YACC@ ; fi` - -# We have to set this, because autoconf 2.59 does not substitute YFLAGS. -# Autoconf 2.61 does, so this can be removed when we upgrade. -YFLAGS = +YFLAGS = @YFLAGS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -762,7 +759,7 @@ INCDIR = $(BASEDIR)/include # Both . and srcdir are used, in that order, # so that tm.h and config.h will be found in the compilation # subdirectory rather than in the source directory. -INCLUDES = -I. -I$(srcdir) -I../bfd -I$(srcdir)/config \ +AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(srcdir)/config \ -I$(INCDIR) -I$(srcdir)/.. -I$(BFDDIR) @INCINTL@ \ -DLOCALEDIR="\"$(datadir)/locale\"" |