diff options
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 7 | ||||
| -rw-r--r-- | gold/Makefile.am | 2 | ||||
| -rw-r--r-- | gold/Makefile.in | 2 | ||||
| -rw-r--r-- | gold/testsuite/Makefile.am | 5 | ||||
| -rw-r--r-- | gold/testsuite/Makefile.in | 6 |
5 files changed, 16 insertions, 6 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 6194e6f..291c5d6 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,5 +1,12 @@ 2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + * Makefile.am (AM_CPPFLAGS): Renamed from ... + (INCLUDES): ... this. + * testsuite/Makefile.am (AUTOMAKE_OPTIONS): Add -Wno-portability. + (AM_CPPFLAGS): Renamed from ... + (INCLUDE): ... this. + * Makefile.in, testsuite/Makefile.in: Regenerate. + * Makefile.in: Regenerate. * aclocal.m4: Likewise. * config.in: Likewise. diff --git a/gold/Makefile.am b/gold/Makefile.am index 4be1d47..876cc9b 100644 --- a/gold/Makefile.am +++ b/gold/Makefile.am @@ -11,7 +11,7 @@ ACLOCAL_AMFLAGS = -I ../bfd -I ../config AM_CFLAGS = $(WARN_CFLAGS) $(LFS_CFLAGS) $(RANDOM_SEED_CFLAGS) AM_CXXFLAGS = $(WARN_CXXFLAGS) $(LFS_CFLAGS) $(RANDOM_SEED_CFLAGS) -INCLUDES = \ +AM_CPPFLAGS = \ -I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../elfcpp \ -DLOCALEDIR="\"$(datadir)/locale\"" \ -DBINDIR="\"$(bindir)\"" -DTOOLBINDIR="\"$(tooldir)/bin\"" \ diff --git a/gold/Makefile.in b/gold/Makefile.in index 8cad2f4..a240795 100644 --- a/gold/Makefile.in +++ b/gold/Makefile.in @@ -332,7 +332,7 @@ tooldir = $(exec_prefix)/$(target_alias) ACLOCAL_AMFLAGS = -I ../bfd -I ../config AM_CFLAGS = $(WARN_CFLAGS) $(LFS_CFLAGS) $(RANDOM_SEED_CFLAGS) AM_CXXFLAGS = $(WARN_CXXFLAGS) $(LFS_CFLAGS) $(RANDOM_SEED_CFLAGS) -INCLUDES = \ +AM_CPPFLAGS = \ -I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../elfcpp \ -DLOCALEDIR="\"$(datadir)/locale\"" \ -DBINDIR="\"$(bindir)\"" -DTOOLBINDIR="\"$(tooldir)/bin\"" \ diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am index 6aafde9..1d6d06b 100644 --- a/gold/testsuite/Makefile.am +++ b/gold/testsuite/Makefile.am @@ -4,7 +4,8 @@ # system and the host system are the same. So these tests will not # work when building with a cross-compiler. -AUTOMAKE_OPTIONS = foreign +# Ignore warning about AM_PROG_CC_C_O due to large_CFLAGS +AUTOMAKE_OPTIONS = foreign -Wno-portability # The two_file_test tests -fmerge-constants, so we simply always turn # it on. This may need to be controlled by a configure option @@ -12,7 +13,7 @@ AUTOMAKE_OPTIONS = foreign AM_CFLAGS = $(WARN_CFLAGS) $(LFS_CFLAGS) -fmerge-constants AM_CXXFLAGS = $(WARN_CXXFLAGS) $(LFS_CFLAGS) -fmerge-constants -INCLUDES = \ +AM_CPPFLAGS = \ -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../../include \ -I$(srcdir)/../../elfcpp -I.. \ -DLOCALEDIR="\"$(datadir)/locale\"" \ diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in index aabe85b..461ee73 100644 --- a/gold/testsuite/Makefile.in +++ b/gold/testsuite/Makefile.in @@ -1335,14 +1335,16 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = foreign + +# Ignore warning about AM_PROG_CC_C_O due to large_CFLAGS +AUTOMAKE_OPTIONS = foreign -Wno-portability # The two_file_test tests -fmerge-constants, so we simply always turn # it on. This may need to be controlled by a configure option # eventually. AM_CFLAGS = $(WARN_CFLAGS) $(LFS_CFLAGS) -fmerge-constants AM_CXXFLAGS = $(WARN_CXXFLAGS) $(LFS_CFLAGS) -fmerge-constants -INCLUDES = \ +AM_CPPFLAGS = \ -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../../include \ -I$(srcdir)/../../elfcpp -I.. \ -DLOCALEDIR="\"$(datadir)/locale\"" \ |