From 70ff5fbe7d1e48175e1da5a28f23ffdefe64f753 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 22 Aug 2009 19:02:57 +0000 Subject: Cleanups in binutils makefiles. ld/: * Makefile.am (bin_PROGRAMS): Renamed from ... (noinst_PROGRAMS): ... this. (transform): Override, including the renaming of ld-new to ld. (install-exec-local): Installation of ld in $(bindir) not needed here any more. (AM_CPPFLAGS): Renamed from ... (INCLUDES): ... this. (MAINTAINERCLEANFILES): Add ld.1. * Makefile.in: Regenerate. gold/: * 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. bfd/: * Makefile.am (libbfd_la_LDFLAGS): Initialize early, to allow appending. [INSTALL_LIBBFD] (bfdlib_LTLIBRARIES, bfdinclude_HEADERS): Set only in this condition. [!INSTALL_LIBBFD] (noinst_LTLIBRARIES, libbfd_la_LDFLAGS): New, to build but not install libbfd.la in this condition. (install-bfdlibLTLIBRARIES, uninstall-bfdlibLTLIBRARIES) (install_libbfd, install_libbfd): Remove. * Makefile.in: Regenerate. binutils/: * Makefile.am (AM_CPPFLAGS): Renamed from ... (INCLUDES): ... this. (bin2c$(EXEEXT_FOR_BUILD): Adjust rule. (installcheck-local): Renamed from ... (installcheck): ... this. * Makefile.in: Regenerate. gas/: * Makefile.am (YFLAGS): Remove, not needed any more. (AM_CPPFLAGS): Renamed from ... (INCLUDES): ... this. * Makefile.in: Regenerate. gprof/: * Makefile.am (AM_CPPFLAGS): Renamed from ... (INCLUDES): ... this. * Makefile.in: Regenerate. opcodes/: * Makefile.am (libopcodes_la_LDFLAGS): Initialize early. [INSTALL_LIBBFD] (bfdlib_LTLIBRARIES): Set only in this condition. [INSTALL_LIBBFD] (bfdinclude_DATA): New. [!INSTALL_LIBBFD] (noinst_LTLIBRARIES): New. [!INSTALL_LIBBFD] (libopcodes_la_LDFLAGS): Ensure libopcodes.la is built shared even if it is not to be installed. (install-bfdlibLTLIBRARIES,uninstall-bfdlibLTLIBRARIES) (install_libopcodes, uninstall_libopcodes): Remove. (AM_CPPFLAGS): Renamed from ... (INCLUDES): ... this. * Makefile.in: Regenerate. --- gold/ChangeLog | 7 +++++++ gold/Makefile.am | 2 +- gold/Makefile.in | 2 +- gold/testsuite/Makefile.am | 5 +++-- gold/testsuite/Makefile.in | 6 ++++-- 5 files changed, 16 insertions(+), 6 deletions(-) (limited to 'gold') diff --git a/gold/ChangeLog b/gold/ChangeLog index 6194e6f483..291c5d6a08 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,5 +1,12 @@ 2009-08-22 Ralf Wildenhues + * 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 4be1d47d1d..876cc9beb0 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 8cad2f4cdf..a240795b93 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 6aafde980e..1d6d06b244 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 aabe85b7f9..461ee73a2c 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\"" \ -- cgit v1.2.1