From 14ec8efdb130026287714cd32332bb9e5a25e779 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. --- gprof/ChangeLog | 4 ++++ gprof/Makefile.am | 2 +- gprof/Makefile.in | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'gprof') diff --git a/gprof/ChangeLog b/gprof/ChangeLog index 4516ba1..7a44010 100644 --- a/gprof/ChangeLog +++ b/gprof/ChangeLog @@ -1,5 +1,9 @@ 2009-08-22 Ralf Wildenhues + * Makefile.am (AM_CPPFLAGS): Renamed from ... + (INCLUDES): ... this. + * Makefile.in: Regenerate. + * Makefile.am (AUTOMAKE_OPTIONS): Remove cygnus, add 1.11, foreign, no-dist, no-texinfo.tex. (TEXINFO_TEX): New variable. diff --git a/gprof/Makefile.am b/gprof/Makefile.am index 3f41b51..7df059b 100644 --- a/gprof/Makefile.am +++ b/gprof/Makefile.am @@ -16,7 +16,7 @@ WARN_CFLAGS = @WARN_CFLAGS@ NO_WERROR = @NO_WERROR@ AM_CFLAGS = $(WARN_CFLAGS) -INCLUDES = -DDEBUG -I../bfd -I$(srcdir)/../include \ +AM_CPPFLAGS = -DDEBUG -I../bfd -I$(srcdir)/../include \ -I$(srcdir)/../bfd @INCINTL@ -I. \ -DLOCALEDIR="\"$(datadir)/locale\"" diff --git a/gprof/Makefile.in b/gprof/Makefile.in index 5d26510..c67e913 100644 --- a/gprof/Makefile.in +++ b/gprof/Makefile.in @@ -283,7 +283,7 @@ BASEDIR = $(srcdir)/.. BFDDIR = $(BASEDIR)/bfd INCDIR = $(BASEDIR)/include AM_CFLAGS = $(WARN_CFLAGS) -INCLUDES = -DDEBUG -I../bfd -I$(srcdir)/../include \ +AM_CPPFLAGS = -DDEBUG -I../bfd -I$(srcdir)/../include \ -I$(srcdir)/../bfd @INCINTL@ -I. \ -DLOCALEDIR="\"$(datadir)/locale\"" -- cgit v1.1