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. --- bfd/ChangeLog | 14 +++++ bfd/Makefile.am | 39 +++---------- bfd/Makefile.in | 126 ++++++++++++++++++++++++++---------------- bfd/doc/Makefile.am | 4 +- bfd/doc/Makefile.in | 4 +- binutils/ChangeLog | 7 +++ binutils/Makefile.am | 6 +- binutils/Makefile.in | 21 ++++--- gas/ChangeLog | 5 ++ gas/Makefile.am | 6 +- gas/Makefile.in | 7 +-- gold/ChangeLog | 7 +++ gold/Makefile.am | 2 +- gold/Makefile.in | 2 +- gold/testsuite/Makefile.am | 5 +- gold/testsuite/Makefile.in | 6 +- gprof/ChangeLog | 4 ++ gprof/Makefile.am | 2 +- gprof/Makefile.in | 2 +- ld/ChangeLog | 10 ++++ ld/Makefile.am | 15 ++--- ld/Makefile.in | 89 ++++++++++++++++++++---------- opcodes/ChangeLog | 12 ++++ opcodes/Makefile.am | 35 +++--------- opcodes/Makefile.in | 133 +++++++++++++++++++++++++++++---------------- 25 files changed, 339 insertions(+), 224 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 9a5a70dc33..149cf63ac1 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,19 @@ 2009-08-22 Ralf Wildenhues + * 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. + * doc/Makefile.am (AM_CPPFLAGS): Renamed from ... + (INCLUDES): ... this. + ($(MKDOC)): Adjust. + * doc/Makefile.in: Regenerate. + * Makefile.am (AUTOMAKE_OPTIONS): Remove cygnus, instead use no-dist and foreign. (EXTRA_libbfd_la_SOURCES): New, list $(CFILES) to allow diff --git a/bfd/Makefile.am b/bfd/Makefile.am index fe79ea2320..8381492dc4 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -15,7 +15,14 @@ bfddocdir = doc bfdlibdir = @bfdlibdir@ bfdincludedir = @bfdincludedir@ +libbfd_la_LDFLAGS = +if INSTALL_LIBBFD bfdlib_LTLIBRARIES = libbfd.la +bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h +else !INSTALL_LIBBFD +noinst_LTLIBRARIES = libbfd.la +libbfd_la_LDFLAGS += -rpath $(bfdlibdir) +endif WARN_CFLAGS = @WARN_CFLAGS@ NO_WERROR = @NO_WERROR@ @@ -750,7 +757,7 @@ libbfd_la_SOURCES = $(BFD32_LIBS_CFILES) EXTRA_libbfd_la_SOURCES = $(CFILES) libbfd_la_DEPENDENCIES = $(OFILES) ofiles libbfd_la_LIBADD = `cat ofiles` @SHARED_LIBADD@ $(LIBDL) -libbfd_la_LDFLAGS = -release `cat libtool-soversion` @SHARED_LDFLAGS@ +libbfd_la_LDFLAGS += -release `cat libtool-soversion` @SHARED_LDFLAGS@ # libtool will build .libs/libbfd.a. We create libbfd.a in the build # directory so that we don't have to convert all the programs that use @@ -862,36 +869,6 @@ $(BFD32_LIBS) \ $(BFD64_BACKENDS) \ $(OPTIONAL_BACKENDS): $(BFD_H) $(BFD_H_DEPS) $(LOCAL_H_DEPS) -install-bfdlibLTLIBRARIES: @INSTALL_LIBBFD_TRUE@install_libbfd - @$(NORMAL_INSTALL) - -uninstall-bfdlibLTLIBRARIES: @INSTALL_LIBBFD_TRUE@uninstall_libbfd - @$(NORMAL_UNINSTALL) - -.PHONY: install_libbfd uninstall_libbfd -install_libbfd: $(bfdlib_LTLIBRARIES) $(BFD_H) - $(mkinstalldirs) $(DESTDIR)$(bfdlibdir) - $(mkinstalldirs) $(DESTDIR)$(bfdincludedir) - @list='$(bfdlib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(bfdlibdir)/$$p"; \ - $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(bfdlibdir)/$$p; \ - else :; fi; \ - done - $(INSTALL_DATA) $(BFD_H) $(DESTDIR)$(bfdincludedir)/bfd.h - $(INSTALL_DATA) $(INCDIR)/ansidecl.h $(DESTDIR)$(bfdincludedir)/ansidecl.h - $(INSTALL_DATA) $(INCDIR)/symcat.h $(DESTDIR)$(bfdincludedir)/symcat.h - $(INSTALL_DATA) $(INCDIR)/bfdlink.h $(DESTDIR)$(bfdincludedir)/bfdlink.h - -uninstall_libbfd: - list='$(bfdlib_LTLIBRARIES)'; for p in $$list; do \ - $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(bfdlibdir)/$$p; \ - done - rm -f $(DESTDIR)$(bfdincludedir)/bfd.h - rm -f $(DESTDIR)$(bfdincludedir)/ansidecl.h - rm -f $(DESTDIR)$(bfdincludedir)/symcat.h - rm -f $(DESTDIR)$(bfdincludedir)/bfdlink.h - host-aout.lo: Makefile # The following program can be used to generate a simple config file diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 690cf8f9b8..f350990720 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -16,6 +16,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -36,12 +37,14 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +@INSTALL_LIBBFD_FALSE@am__append_1 = -rpath $(bfdlibdir) subdir = . DIST_COMMON = README ChangeLog $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(srcdir)/config.in \ $(srcdir)/../mkinstalldirs $(srcdir)/bfd-in2.h \ - $(top_srcdir)/po/Make-in $(srcdir)/../depcomp + $(top_srcdir)/po/Make-in $(srcdir)/../depcomp \ + $(am__bfdinclude_HEADERS_DIST) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/depstand.m4 \ @@ -92,8 +95,9 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(bfdlibdir)" -LTLIBRARIES = $(bfdlib_LTLIBRARIES) +am__installdirs = "$(DESTDIR)$(bfdlibdir)" \ + "$(DESTDIR)$(bfdincludedir)" +LTLIBRARIES = $(bfdlib_LTLIBRARIES) $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = am__objects_1 = archive.lo archures.lo bfd.lo bfdio.lo bfdwin.lo \ cache.lo coffgen.lo corefile.lo format.lo init.lo libbfd.lo \ @@ -106,6 +110,8 @@ libbfd_la_OBJECTS = $(am_libbfd_la_OBJECTS) libbfd_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libbfd_la_LDFLAGS) $(LDFLAGS) -o $@ +@INSTALL_LIBBFD_FALSE@am_libbfd_la_rpath = +@INSTALL_LIBBFD_TRUE@am_libbfd_la_rpath = -rpath $(bfdlibdir) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/../depcomp am__depfiles_maybe = depfiles @@ -128,6 +134,9 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__bfdinclude_HEADERS_DIST = bfd.h $(INCDIR)/ansidecl.h \ + $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h +HEADERS = $(bfdinclude_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -310,7 +319,11 @@ INCDIR = $(srcdir)/../include CSEARCH = -I. -I$(srcdir) -I$(INCDIR) SUBDIRS = doc po bfddocdir = doc -bfdlib_LTLIBRARIES = libbfd.la +libbfd_la_LDFLAGS = $(am__append_1) -release `cat libtool-soversion` \ + @SHARED_LDFLAGS@ $(am__empty) +@INSTALL_LIBBFD_TRUE@bfdlib_LTLIBRARIES = libbfd.la +@INSTALL_LIBBFD_TRUE@bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h +@INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libbfd.la AM_CFLAGS = $(WARN_CFLAGS) AM_CPPFLAGS = -DBINDIR='"$(bindir)"' @PLUGINS_TRUE@LIBDL = -ldl @@ -1011,7 +1024,6 @@ libbfd_la_SOURCES = $(BFD32_LIBS_CFILES) EXTRA_libbfd_la_SOURCES = $(CFILES) libbfd_la_DEPENDENCIES = $(OFILES) ofiles libbfd_la_LIBADD = `cat ofiles` @SHARED_LIBADD@ $(LIBDL) -libbfd_la_LDFLAGS = -release `cat libtool-soversion` @SHARED_LDFLAGS@ # libtool will build .libs/libbfd.a. We create libbfd.a in the build # directory so that we don't have to convert all the programs that use @@ -1098,6 +1110,28 @@ po/Makefile.in: $(top_builddir)/config.status $(top_srcdir)/po/Make-in clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) +install-bfdlibLTLIBRARIES: $(bfdlib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(bfdlibdir)" || $(MKDIR_P) "$(DESTDIR)$(bfdlibdir)" + @list='$(bfdlib_LTLIBRARIES)'; test -n "$(bfdlibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(bfdlibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(bfdlibdir)"; \ + } + +uninstall-bfdlibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(bfdlib_LTLIBRARIES)'; test -n "$(bfdlibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(bfdlibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(bfdlibdir)/$$f"; \ + done clean-bfdlibLTLIBRARIES: -test -z "$(bfdlib_LTLIBRARIES)" || rm -f $(bfdlib_LTLIBRARIES) @@ -1107,8 +1141,17 @@ clean-bfdlibLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done libbfd.la: $(libbfd_la_OBJECTS) $(libbfd_la_DEPENDENCIES) - $(libbfd_la_LINK) -rpath $(bfdlibdir) $(libbfd_la_OBJECTS) $(libbfd_la_LIBADD) $(LIBS) + $(libbfd_la_LINK) $(am_libbfd_la_rpath) $(libbfd_la_OBJECTS) $(libbfd_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1465,6 +1508,26 @@ clean-libtool: distclean-libtool: -rm -f libtool config.lt +install-bfdincludeHEADERS: $(bfdinclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(bfdincludedir)" || $(MKDIR_P) "$(DESTDIR)$(bfdincludedir)" + @list='$(bfdinclude_HEADERS)'; test -n "$(bfdincludedir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(bfdincludedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(bfdincludedir)" || exit $$?; \ + done + +uninstall-bfdincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(bfdinclude_HEADERS)'; test -n "$(bfdincludedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bfdincludedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bfdincludedir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -1603,10 +1666,10 @@ distclean-tags: check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-recursive -all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) config.h +all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bfdlibdir)"; do \ + for dir in "$(DESTDIR)$(bfdlibdir)" "$(DESTDIR)$(bfdincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1642,7 +1705,7 @@ maintainer-clean-generic: clean: clean-recursive clean-am: clean-bfdlibLTLIBRARIES clean-generic clean-libtool \ - clean-noinstLIBRARIES mostlyclean-am + clean-noinstLIBRARIES clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -1663,7 +1726,7 @@ info: info-recursive info-am: -install-data-am: install-bfdlibLTLIBRARIES +install-data-am: install-bfdincludeHEADERS install-bfdlibLTLIBRARIES install-dvi: install-dvi-recursive @@ -1711,7 +1774,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-bfdlibLTLIBRARIES +uninstall-am: uninstall-bfdincludeHEADERS uninstall-bfdlibLTLIBRARIES .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ ctags-recursive install install-am install-strip \ @@ -1720,10 +1783,11 @@ uninstall-am: uninstall-bfdlibLTLIBRARIES .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean \ clean-bfdlibLTLIBRARIES clean-generic clean-libtool \ - clean-noinstLIBRARIES ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-hdr \ - distclean-libtool distclean-tags dvi dvi-am html html-am info \ - info-am install install-am install-bfdlibLTLIBRARIES \ + clean-noinstLIBRARIES clean-noinstLTLIBRARIES ctags \ + ctags-recursive distclean distclean-compile distclean-generic \ + distclean-hdr distclean-libtool distclean-tags dvi dvi-am html \ + html-am info info-am install install-am \ + install-bfdincludeHEADERS install-bfdlibLTLIBRARIES \ install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-pdf \ @@ -1732,7 +1796,7 @@ uninstall-am: uninstall-bfdlibLTLIBRARIES maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-bfdlibLTLIBRARIES + uninstall-bfdincludeHEADERS uninstall-bfdlibLTLIBRARIES po/SRC-POTFILES.in: @MAINT@ Makefile $(SRC_POTFILES) @@ -1846,36 +1910,6 @@ $(BFD32_LIBS) \ $(BFD64_BACKENDS) \ $(OPTIONAL_BACKENDS): $(BFD_H) $(BFD_H_DEPS) $(LOCAL_H_DEPS) -install-bfdlibLTLIBRARIES: @INSTALL_LIBBFD_TRUE@install_libbfd - @$(NORMAL_INSTALL) - -uninstall-bfdlibLTLIBRARIES: @INSTALL_LIBBFD_TRUE@uninstall_libbfd - @$(NORMAL_UNINSTALL) - -.PHONY: install_libbfd uninstall_libbfd -install_libbfd: $(bfdlib_LTLIBRARIES) $(BFD_H) - $(mkinstalldirs) $(DESTDIR)$(bfdlibdir) - $(mkinstalldirs) $(DESTDIR)$(bfdincludedir) - @list='$(bfdlib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(bfdlibdir)/$$p"; \ - $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(bfdlibdir)/$$p; \ - else :; fi; \ - done - $(INSTALL_DATA) $(BFD_H) $(DESTDIR)$(bfdincludedir)/bfd.h - $(INSTALL_DATA) $(INCDIR)/ansidecl.h $(DESTDIR)$(bfdincludedir)/ansidecl.h - $(INSTALL_DATA) $(INCDIR)/symcat.h $(DESTDIR)$(bfdincludedir)/symcat.h - $(INSTALL_DATA) $(INCDIR)/bfdlink.h $(DESTDIR)$(bfdincludedir)/bfdlink.h - -uninstall_libbfd: - list='$(bfdlib_LTLIBRARIES)'; for p in $$list; do \ - $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(bfdlibdir)/$$p; \ - done - rm -f $(DESTDIR)$(bfdincludedir)/bfd.h - rm -f $(DESTDIR)$(bfdincludedir)/ansidecl.h - rm -f $(DESTDIR)$(bfdincludedir)/symcat.h - rm -f $(DESTDIR)$(bfdincludedir)/bfdlink.h - host-aout.lo: Makefile # The following program can be used to generate a simple config file diff --git a/bfd/doc/Makefile.am b/bfd/doc/Makefile.am index 2a10fc0c75..7476ee5bab 100644 --- a/bfd/doc/Makefile.am +++ b/bfd/doc/Makefile.am @@ -56,12 +56,12 @@ bfd_TEXINFOS = $(DOCFILES) bfdsumm.texi MKDOC = chew$(EXEEXT_FOR_BUILD) -INCLUDES = -I.. -I$(srcdir)/.. -I$(srcdir)/../../include \ +AM_CPPFLAGS = -I.. -I$(srcdir)/.. -I$(srcdir)/../../include \ -I$(srcdir)/../../intl -I../../intl $(MKDOC): $(srcdir)/chew.c $(CC_FOR_BUILD) -o chew.$$$$ $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \ - $(H_CFLAGS) $(INCLUDES) $(srcdir)/chew.c; \ + $(H_CFLAGS) $(AM_CPPFLAGS) $(srcdir)/chew.c; \ $(SHELL) $(srcdir)/../../move-if-change chew.$$$$ $(MKDOC) protos: libbfd.h libcoff.h bfd.h diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in index 87346e2b04..526423a0cb 100644 --- a/bfd/doc/Makefile.in +++ b/bfd/doc/Makefile.in @@ -322,7 +322,7 @@ TEXIDIR = $(srcdir)/../../texinfo/fsf info_TEXINFOS = bfd.texinfo bfd_TEXINFOS = $(DOCFILES) bfdsumm.texi MKDOC = chew$(EXEEXT_FOR_BUILD) -INCLUDES = -I.. -I$(srcdir)/.. -I$(srcdir)/../../include \ +AM_CPPFLAGS = -I.. -I$(srcdir)/.. -I$(srcdir)/../../include \ -I$(srcdir)/../../intl -I../../intl LIBBFD_H_DEP = \ @@ -758,7 +758,7 @@ uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \ $(MKDOC): $(srcdir)/chew.c $(CC_FOR_BUILD) -o chew.$$$$ $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \ - $(H_CFLAGS) $(INCLUDES) $(srcdir)/chew.c; \ + $(H_CFLAGS) $(AM_CPPFLAGS) $(srcdir)/chew.c; \ $(SHELL) $(srcdir)/../../move-if-change chew.$$$$ $(MKDOC) protos: libbfd.h libcoff.h bfd.h diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 500e05776f..7d8f48fd1e 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,12 @@ 2009-08-22 Ralf Wildenhues + * Makefile.am (AM_CPPFLAGS): Renamed from ... + (INCLUDES): ... this. + (bin2c$(EXEEXT_FOR_BUILD): Adjust rule. + (installcheck-local): Renamed from ... + (installcheck): ... this. + * Makefile.in: Regenerate. + * Makefile.am (AUTOMAKE_OPTIONS): Remove cygnus, add no-dist and foreign. (MKDEP, CLEANFILES): Remove now-unneeded variables. diff --git a/binutils/Makefile.am b/binutils/Makefile.am index 9dc52950ef..aab446de3b 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -69,7 +69,7 @@ BASEDIR = $(srcdir)/.. BFDDIR = $(BASEDIR)/bfd INCDIR = $(BASEDIR)/include -INCLUDES = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ +AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ @HDEFINES@ \ @INCINTL@ \ -DLOCALEDIR="\"$(datadir)/locale\"" \ @@ -150,7 +150,7 @@ check-DEJAGNU: site.exp else echo "WARNING: could not find \`runtest'" 1>&2; :;\ fi -installcheck: +installcheck-local: /bin/sh $(srcdir)/sanity.sh $(bindir) # There's no global DEPENDENCIES. So, we must explicitly list everything @@ -263,7 +263,7 @@ sysinfo.o: sysinfo.c fi bin2c$(EXEEXT_FOR_BUILD): - $(CC_FOR_BUILD) -o $@ $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(srcdir)/bin2c.c $(srcdir)/version.c + $(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(srcdir)/bin2c.c $(srcdir)/version.c embedspu: embedspu.sh sed "s@^program_transform_name=@program_transform_name=$(program_transform_name)@" < $< > $@ diff --git a/binutils/Makefile.in b/binutils/Makefile.in index ecce5b8cd5..52861425a3 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -408,7 +408,7 @@ TOOL_PROGS = nm-new strip-new ar ranlib dlltool objdump objcopy BASEDIR = $(srcdir)/.. BFDDIR = $(BASEDIR)/bfd INCDIR = $(BASEDIR)/include -INCLUDES = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ +AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ @HDEFINES@ \ @INCINTL@ \ -DLOCALEDIR="\"$(datadir)/locale\"" \ @@ -1005,6 +1005,8 @@ uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ @@ -1087,7 +1089,7 @@ install-ps: install-ps-recursive install-ps-am: -installcheck-am: +installcheck-am: installcheck-local maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -1126,11 +1128,12 @@ uninstall-am: uninstall-binPROGRAMS install-exec install-exec-am install-exec-local install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \ - tags-recursive uninstall uninstall-am uninstall-binPROGRAMS + install-strip installcheck installcheck-am installcheck-local \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-binPROGRAMS po/POTFILES.in: @MAINT@ Makefile for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \ @@ -1148,7 +1151,7 @@ check-DEJAGNU: site.exp else echo "WARNING: could not find \`runtest'" 1>&2; :;\ fi -installcheck: +installcheck-local: /bin/sh $(srcdir)/sanity.sh $(bindir) objdump.o:objdump.c @@ -1202,7 +1205,7 @@ sysinfo.o: sysinfo.c fi bin2c$(EXEEXT_FOR_BUILD): - $(CC_FOR_BUILD) -o $@ $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(srcdir)/bin2c.c $(srcdir)/version.c + $(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(srcdir)/bin2c.c $(srcdir)/version.c embedspu: embedspu.sh sed "s@^program_transform_name=@program_transform_name=$(program_transform_name)@" < $< > $@ 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 + * 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\"" 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\"" \ diff --git a/gprof/ChangeLog b/gprof/ChangeLog index 4516ba1a59..7a44010fb3 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 3f41b5133d..7df059b9ed 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 5d26510064..c67e91392c 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\"" diff --git a/ld/ChangeLog b/ld/ChangeLog index ac628d8948..6b11a80db7 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,15 @@ 2009-08-22 Ralf Wildenhues + * 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. + * Makefile.am (AUTOMAKE_OPTIONS): Remove cygnus. Add no-texinfo.tex, no-dist, foreign. (TEXINFO_TEX): New variable. diff --git a/ld/Makefile.am b/ld/Makefile.am index 9cd9b54fd6..a2688981be 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -90,7 +90,8 @@ CXX_FOR_TARGET = ` \ fi; \ fi` -noinst_PROGRAMS = ld-new +transform = s/^ld-new$$/ld/;@program_transform_name@ +bin_PROGRAMS = ld-new info_TEXINFOS = ld.texinfo ld_TEXINFOS = configdoc.texi noinst_TEXINFOS = ldint.texinfo @@ -101,7 +102,7 @@ AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I ../bfd/doc \ TEXI2DVI = texi2dvi -I $(srcdir) -I $(BFDDIR)/doc -I ../bfd/doc \ -I $(top_srcdir)/../libiberty -INCLUDES = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ +AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ @INCINTL@ $(HDEFINES) $(CFLAGS) \ -DLOCALEDIR="\"$(datadir)/locale\"" @@ -1924,7 +1925,7 @@ ld.1: $(srcdir)/ld.texinfo configdoc.texi (rm -f $@.T$$$$ && exit 1) rm -f ld.pod -MAINTAINERCLEANFILES = configdoc.texi +MAINTAINERCLEANFILES = configdoc.texi ld.1 # We want to reconfigure if configure.host or configure.tgt changes. We # extract version from bfd/configure.in, so we must depend on that also. @@ -1940,13 +1941,7 @@ CLEANFILES = dep.sed DEP DEPA DEP1 DEP2 spu_ovl.s spu_ovl.o spu_icache.s spu_ica .PHONY: install-exec-local install-data-local install-exec-local: ld-new$(EXEEXT) - $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(tooldir)/bin - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - else :; fi; \ - done + $(mkinstalldirs) $(DESTDIR)$(tooldir)/bin n=`echo ld | sed '$(transform)'`; \ if [ "$(bindir)/$$n$(EXEEXT)" != "$(tooldir)/bin/ld$(EXEEXT)" ]; then \ rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ diff --git a/ld/Makefile.in b/ld/Makefile.in index 137fa54d2f..80105a201c 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -25,7 +25,6 @@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -35,7 +34,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -noinst_PROGRAMS = ld-new$(EXEEXT) +bin_PROGRAMS = ld-new$(EXEEXT) # Automake 1.9 will only build info files in the objdir if they are # mentioned in DISTCLEANFILES. It doesn't have to be unconditional, @@ -69,7 +68,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = po/Makefile.in CONFIG_CLEAN_VPATH_FILES = -PROGRAMS = $(noinst_PROGRAMS) +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" \ + "$(DESTDIR)$(man1dir)" +PROGRAMS = $(bin_PROGRAMS) am_ld_new_OBJECTS = ldgram.$(OBJEXT) ldlex.$(OBJEXT) lexsup.$(OBJEXT) \ ldlang.$(OBJEXT) mri.$(OBJEXT) ldctor.$(OBJEXT) \ ldmain.$(OBJEXT) ldwrite.$(OBJEXT) ldexp.$(OBJEXT) \ @@ -118,7 +119,6 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -152,6 +152,7 @@ CTAGS = ctags DEJATOOL = $(PACKAGE) RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir DIST_SUBDIRS = $(SUBDIRS) +transform = s/^ld-new$$/ld/;@program_transform_name@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AR = @AR@ @@ -388,7 +389,7 @@ AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I ../bfd/doc \ TEXI2DVI = texi2dvi -I $(srcdir) -I $(BFDDIR)/doc -I ../bfd/doc \ -I $(top_srcdir)/../libiberty -INCLUDES = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ +AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ @INCINTL@ $(HDEFINES) $(CFLAGS) \ -DLOCALEDIR="\"$(datadir)/locale\"" @@ -766,7 +767,7 @@ ld_new_SOURCES = ldgram.y ldlex.l lexsup.c ldlang.c mri.c ldctor.c ldmain.c \ ld_new_DEPENDENCIES = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBIBERTY) $(LIBINTL_DEP) ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBIBERTY) $(LIBINTL) -MAINTAINERCLEANFILES = configdoc.texi ld.info +MAINTAINERCLEANFILES = configdoc.texi ld.1 ld.info # We want to reconfigure if configure.host or configure.tgt changes. We # extract version from bfd/configure.in, so we must depend on that also. @@ -842,9 +843,43 @@ distclean-hdr: -rm -f config.h stamp-h1 po/Makefile.in: $(top_builddir)/config.status $(top_srcdir)/po/Make-in cd $(top_builddir) && $(SHELL) ./config.status $@ - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p || test -f $$p1; \ + then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ echo " rm -f" $$list; \ rm -f $$list || exit $$?; \ test -n "$(EXEEXT)" || exit 0; \ @@ -1588,7 +1623,7 @@ check: $(BUILT_SOURCES) all-am: Makefile $(INFO_DEPS) $(PROGRAMS) $(MANS) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1629,8 +1664,8 @@ maintainer-clean-generic: -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-recursive -clean-am: clean-aminfo clean-generic clean-libtool \ - clean-noinstPROGRAMS mostlyclean-am +clean-am: clean-aminfo clean-binPROGRAMS clean-generic clean-libtool \ + mostlyclean-am distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -1668,7 +1703,7 @@ install-dvi-am: $(DVIS) echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \ $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \ done -install-exec-am: install-exec-local +install-exec-am: install-binPROGRAMS install-exec-local install-html: install-html-recursive @@ -1777,8 +1812,9 @@ ps: ps-recursive ps-am: $(PSS) -uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \ - uninstall-man uninstall-pdf-am uninstall-ps-am +uninstall-am: uninstall-binPROGRAMS uninstall-dvi-am uninstall-html-am \ + uninstall-info-am uninstall-man uninstall-pdf-am \ + uninstall-ps-am uninstall-man: uninstall-man1 @@ -1788,13 +1824,14 @@ uninstall-man: uninstall-man1 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-DEJAGNU check-am clean \ - clean-aminfo clean-generic clean-libtool clean-noinstPROGRAMS \ + clean-aminfo clean-binPROGRAMS clean-generic clean-libtool \ ctags ctags-recursive dist-info distclean distclean-DEJAGNU \ distclean-compile distclean-generic distclean-hdr \ distclean-libtool distclean-local distclean-tags dvi dvi-am \ - html html-am info info-am install install-am install-data \ - install-data-am install-data-local install-dvi install-dvi-am \ - install-exec install-exec-am install-exec-local install-html \ + html html-am info info-am install install-am \ + install-binPROGRAMS install-data install-data-am \ + install-data-local install-dvi install-dvi-am install-exec \ + install-exec-am install-exec-local install-html \ install-html-am install-info install-info-am install-man \ install-man1 install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ @@ -1802,9 +1839,9 @@ uninstall-man: uninstall-man1 maintainer-clean-aminfo maintainer-clean-generic mostlyclean \ mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \ - tags-recursive uninstall uninstall-am uninstall-dvi-am \ - uninstall-html-am uninstall-info-am uninstall-man \ - uninstall-man1 uninstall-pdf-am uninstall-ps-am + tags-recursive uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-dvi-am uninstall-html-am uninstall-info-am \ + uninstall-man uninstall-man1 uninstall-pdf-am uninstall-ps-am # Disable -Werror, if it has been enabled, since old versions of bison/ @@ -3223,13 +3260,7 @@ mostlyclean-local: .PHONY: install-exec-local install-data-local install-exec-local: ld-new$(EXEEXT) - $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(tooldir)/bin - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - else :; fi; \ - done + $(mkinstalldirs) $(DESTDIR)$(tooldir)/bin n=`echo ld | sed '$(transform)'`; \ if [ "$(bindir)/$$n$(EXEEXT)" != "$(tooldir)/bin/ld$(EXEEXT)" ]; then \ rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index ecc96c9050..dab825e295 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,5 +1,17 @@ 2009-08-22 Ralf Wildenhues + * 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. + * Makefile.am (AUTOMAKE_OPTIONS): Remove 1.9 and cygnus, add 1.11, foreign, no-dist. (MKDEP, m32c_opc_h): Remove variables. diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index 3c1778ce01..35049ee353 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -15,7 +15,14 @@ AM_CFLAGS = $(WARN_CFLAGS) bfdlibdir = @bfdlibdir@ bfdincludedir = @bfdincludedir@ +libopcodes_la_LDFLAGS = +if INSTALL_LIBBFD bfdlib_LTLIBRARIES = libopcodes.la +bfdinclude_DATA = $(INCDIR)/dis-asm.h +else +noinst_LTLIBRARIES = libopcodes.la +libopcodes_la_LDFLAGS += -rpath $(bfdlibdir) +endif # This is where bfd.h lives. BFD_H = ../bfd/bfd.h @@ -376,7 +383,7 @@ OFILES = @BFD_MACHINES@ # that's where the version number in Makefile comes from. CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in -INCLUDES = -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@ +AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@ disassemble.lo: disassemble.c if am__fastdepCC @@ -399,7 +406,7 @@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c # hardcoded path to libbfd.so instead of relying on the entries in libbfd.la. libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@ libopcodes_la_LIBADD = $(OFILES) @SHARED_LIBADD@ -libopcodes_la_LDFLAGS = -release `cat ../bfd/libtool-soversion` @SHARED_LDFLAGS@ +libopcodes_la_LDFLAGS += -release `cat ../bfd/libtool-soversion` @SHARED_LDFLAGS@ # Allow dependency tracking to work on all the source files. EXTRA_libopcodes_la_SOURCES = $(CFILES) @@ -426,30 +433,6 @@ po/POTFILES.in: @MAINT@ Makefile for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \ && mv tmp $(srcdir)/po/POTFILES.in -install-bfdlibLTLIBRARIES: @INSTALL_LIBBFD_TRUE@install_libopcodes - @$(NORMAL_INSTALL) - -uninstall-bfdlibLTLIBRARIES: @INSTALL_LIBBFD_TRUE@uninstall_libopcodes - @$(NORMAL_UNINSTALL) - -.PHONY: install_libopcodes uninstall_libopcodes -install_libopcodes: $(bfdlib_LTLIBRARIES) - $(mkinstalldirs) $(DESTDIR)$(bfdlibdir) - $(mkinstalldirs) $(DESTDIR)$(bfdincludedir) - @list='$(bfdlib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(bfdlibdir)/$$p"; \ - $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(bfdlibdir)/$$p; \ - else :; fi; \ - done - $(INSTALL_DATA) $(INCDIR)/dis-asm.h $(DESTDIR)$(bfdincludedir)/dis-asm.h - -uninstall_libopcodes: - list='$(bfdlib_LTLIBRARIES)'; for p in $$list; do \ - $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(bfdlibdir)/$$p; \ - done - rm -f $(DESTDIR)$(bfdincludedir)/dis-asm.h - CLEANFILES = \ stamp-ip2k stamp-m32c stamp-m32r stamp-fr30 stamp-frv \ stamp-openrisc stamp-iq2000 stamp-mep stamp-mt stamp-xstormy16 stamp-xc16x\ diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index 037f5ac1e9..0d8294ba90 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -16,6 +16,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -36,6 +37,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +@INSTALL_LIBBFD_FALSE@am__append_1 = -rpath $(bfdlibdir) subdir = . DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ @@ -89,14 +91,17 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(bfdlibdir)" -LTLIBRARIES = $(bfdlib_LTLIBRARIES) +am__installdirs = "$(DESTDIR)$(bfdlibdir)" \ + "$(DESTDIR)$(bfdincludedir)" +LTLIBRARIES = $(bfdlib_LTLIBRARIES) $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = am_libopcodes_la_OBJECTS = dis-buf.lo disassemble.lo dis-init.lo libopcodes_la_OBJECTS = $(am_libopcodes_la_OBJECTS) libopcodes_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libopcodes_la_LDFLAGS) $(LDFLAGS) -o $@ +@INSTALL_LIBBFD_FALSE@am_libopcodes_la_rpath = +@INSTALL_LIBBFD_TRUE@am_libopcodes_la_rpath = -rpath $(bfdlibdir) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/../depcomp am__depfiles_maybe = depfiles @@ -119,6 +124,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +DATA = $(bfdinclude_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -279,7 +285,11 @@ SUBDIRS = po INCDIR = $(srcdir)/../include BFDDIR = $(srcdir)/../bfd AM_CFLAGS = $(WARN_CFLAGS) -bfdlib_LTLIBRARIES = libopcodes.la +libopcodes_la_LDFLAGS = $(am__append_1) -release `cat \ + ../bfd/libtool-soversion` @SHARED_LDFLAGS@ +@INSTALL_LIBBFD_TRUE@bfdlib_LTLIBRARIES = libopcodes.la +@INSTALL_LIBBFD_TRUE@bfdinclude_DATA = $(INCDIR)/dis-asm.h +@INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libopcodes.la # This is where bfd.h lives. BFD_H = ../bfd/bfd.h @@ -640,7 +650,7 @@ OFILES = @BFD_MACHINES@ # We should reconfigure whenever bfd/configure.in changes, because # that's where the version number in Makefile comes from. CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in -INCLUDES = -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@ +AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c # It's desirable to list ../bfd/libbfd.la in DEPENDENCIES and LIBADD. # Unfortunately this causes libtool to add -L$(libdir), referring to the @@ -650,7 +660,6 @@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c # hardcoded path to libbfd.so instead of relying on the entries in libbfd.la. libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@ libopcodes_la_LIBADD = $(OFILES) @SHARED_LIBADD@ -libopcodes_la_LDFLAGS = -release `cat ../bfd/libtool-soversion` @SHARED_LDFLAGS@ # Allow dependency tracking to work on all the source files. EXTRA_libopcodes_la_SOURCES = $(CFILES) @@ -762,6 +771,28 @@ po/Makefile.in: $(top_builddir)/config.status $(top_srcdir)/po/Make-in clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) +install-bfdlibLTLIBRARIES: $(bfdlib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(bfdlibdir)" || $(MKDIR_P) "$(DESTDIR)$(bfdlibdir)" + @list='$(bfdlib_LTLIBRARIES)'; test -n "$(bfdlibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(bfdlibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(bfdlibdir)"; \ + } + +uninstall-bfdlibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(bfdlib_LTLIBRARIES)'; test -n "$(bfdlibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(bfdlibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(bfdlibdir)/$$f"; \ + done clean-bfdlibLTLIBRARIES: -test -z "$(bfdlib_LTLIBRARIES)" || rm -f $(bfdlib_LTLIBRARIES) @@ -771,8 +802,17 @@ clean-bfdlibLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done libopcodes.la: $(libopcodes_la_OBJECTS) $(libopcodes_la_DEPENDENCIES) - $(libopcodes_la_LINK) -rpath $(bfdlibdir) $(libopcodes_la_OBJECTS) $(libopcodes_la_LIBADD) $(LIBS) + $(libopcodes_la_LINK) $(am_libopcodes_la_rpath) $(libopcodes_la_OBJECTS) $(libopcodes_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -973,6 +1013,26 @@ clean-libtool: distclean-libtool: -rm -f libtool config.lt +install-bfdincludeDATA: $(bfdinclude_DATA) + @$(NORMAL_INSTALL) + test -z "$(bfdincludedir)" || $(MKDIR_P) "$(DESTDIR)$(bfdincludedir)" + @list='$(bfdinclude_DATA)'; test -n "$(bfdincludedir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(bfdincludedir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(bfdincludedir)" || exit $$?; \ + done + +uninstall-bfdincludeDATA: + @$(NORMAL_UNINSTALL) + @list='$(bfdinclude_DATA)'; test -n "$(bfdincludedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bfdincludedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bfdincludedir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -1110,10 +1170,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-am: all-am check: check-recursive -all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) config.h +all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bfdlibdir)"; do \ + for dir in "$(DESTDIR)$(bfdlibdir)" "$(DESTDIR)$(bfdincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -1145,7 +1205,7 @@ maintainer-clean-generic: clean: clean-recursive clean-am: clean-bfdlibLTLIBRARIES clean-generic clean-libtool \ - clean-noinstLIBRARIES mostlyclean-am + clean-noinstLIBRARIES clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -1166,7 +1226,7 @@ info: info-recursive info-am: -install-data-am: install-bfdlibLTLIBRARIES +install-data-am: install-bfdincludeDATA install-bfdlibLTLIBRARIES install-dvi: install-dvi-recursive @@ -1214,7 +1274,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-bfdlibLTLIBRARIES +uninstall-am: uninstall-bfdincludeDATA uninstall-bfdlibLTLIBRARIES .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ ctags-recursive install-am install-strip tags-recursive @@ -1222,19 +1282,20 @@ uninstall-am: uninstall-bfdlibLTLIBRARIES .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean \ clean-bfdlibLTLIBRARIES clean-generic clean-libtool \ - clean-noinstLIBRARIES ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-hdr \ - distclean-libtool distclean-tags dvi dvi-am html html-am info \ - info-am install install-am install-bfdlibLTLIBRARIES \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-bfdlibLTLIBRARIES + clean-noinstLIBRARIES clean-noinstLTLIBRARIES ctags \ + ctags-recursive distclean distclean-compile distclean-generic \ + distclean-hdr distclean-libtool distclean-tags dvi dvi-am html \ + html-am info info-am install install-am install-bfdincludeDATA \ + install-bfdlibLTLIBRARIES install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ + uninstall-bfdincludeDATA uninstall-bfdlibLTLIBRARIES disassemble.lo: disassemble.c @@ -1258,30 +1319,6 @@ po/POTFILES.in: @MAINT@ Makefile for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \ && mv tmp $(srcdir)/po/POTFILES.in -install-bfdlibLTLIBRARIES: @INSTALL_LIBBFD_TRUE@install_libopcodes - @$(NORMAL_INSTALL) - -uninstall-bfdlibLTLIBRARIES: @INSTALL_LIBBFD_TRUE@uninstall_libopcodes - @$(NORMAL_UNINSTALL) - -.PHONY: install_libopcodes uninstall_libopcodes -install_libopcodes: $(bfdlib_LTLIBRARIES) - $(mkinstalldirs) $(DESTDIR)$(bfdlibdir) - $(mkinstalldirs) $(DESTDIR)$(bfdincludedir) - @list='$(bfdlib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(bfdlibdir)/$$p"; \ - $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(bfdlibdir)/$$p; \ - else :; fi; \ - done - $(INSTALL_DATA) $(INCDIR)/dis-asm.h $(DESTDIR)$(bfdincludedir)/dis-asm.h - -uninstall_libopcodes: - list='$(bfdlib_LTLIBRARIES)'; for p in $$list; do \ - $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(bfdlibdir)/$$p; \ - done - rm -f $(DESTDIR)$(bfdincludedir)/dis-asm.h - run-cgen: $(SHELL) $(srcdir)/cgen.sh opcodes $(srcdir) $(CGEN) \ $(CGENDIR) "$(CGENFLAGS)" $(arch) $(prefix) $(archfile) $(opcfile) \ -- cgit v1.2.1