Fix minor build system issues in lto-plugin.

lto-plugin/:
	* Makefile.am (all-local): Rename from 'all'.
	(gcc_build_dir): Use $(host_subdir).
	* Makefile.in: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@170075 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/lto-plugin/ChangeLog b/lto-plugin/ChangeLog
index 9355ea5..f09f4bf 100644 (file)
--- a/lto-plugin/ChangeLog
+++ b/lto-plugin/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * Makefile.am (all-local): Rename from 'all'.
+       * Makefile.in: Regenerate.
+
 2011-02-12  Alexandre Oliva  <aoliva@redhat.com>
 
        PR lto/47225

diff --git a/lto-plugin/Makefile.am b/lto-plugin/Makefile.am
index fd9ea62..4067c43 100644 (file)
--- a/lto-plugin/Makefile.am
+++ b/lto-plugin/Makefile.am
@@ -12,7 +12,7 @@ AM_CFLAGS = -Wall -Werror
 AM_LIBTOOLFLAGS = --tag=disable-static
 
 libexecsub_LTLIBRARIES = liblto_plugin.la
-gcc_build_dir = ../gcc
+gcc_build_dir = ../$(host_subdir)/gcc
 in_gcc_libs = $(foreach lib, $(libexecsub_LTLIBRARIES), $(gcc_build_dir)/$(lib))
 
 # Can be removed when libiberty becomes a normal convenience library
@@ -27,7 +27,7 @@ liblto_plugin_la_LDFLAGS = $(lt_host_flags) -module -bindir $(libexecsubdir) \
 liblto_plugin_la_DEPENDENCIES = $(if $(wildcard \
        ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,)
 
-all: $(in_gcc_libs)
+all-local: $(in_gcc_libs)
 
 $(in_gcc_libs) : $(gcc_build_dir)/%: %
        @if test "X`dlname=; . ./$*; echo dlname:$$dlname`" = "Xdlname:"; then \

diff --git a/lto-plugin/Makefile.in b/lto-plugin/Makefile.in
index c519204..fbc6df3 100644 (file)
--- a/lto-plugin/Makefile.in
+++ b/lto-plugin/Makefile.in
@@ -230,7 +230,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS)
 AM_CFLAGS = -Wall -Werror
 AM_LIBTOOLFLAGS = --tag=disable-static
 libexecsub_LTLIBRARIES = liblto_plugin.la
-gcc_build_dir = ../gcc
+gcc_build_dir = ../$(host_subdir)/gcc
 in_gcc_libs = $(foreach lib, $(libexecsub_LTLIBRARIES), $(gcc_build_dir)/$(lib))
 
 # Can be removed when libiberty becomes a normal convenience library
@@ -413,7 +413,7 @@ distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES) config.h
+all-am: Makefile $(LTLIBRARIES) config.h all-local
 installdirs:
        for dir in "$(DESTDIR)$(libexecsubdir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
@@ -517,22 +517,23 @@ uninstall-am: uninstall-libexecsubLTLIBRARIES
 
 .MAKE: all install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-       clean-generic clean-libexecsubLTLIBRARIES clean-libtool ctags \
-       distclean distclean-compile distclean-generic distclean-hdr \
-       distclean-libtool distclean-tags dvi dvi-am html html-am info \
-       info-am install install-am 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-libexecsubLTLIBRARIES install-man install-pdf \
-       install-pdf-am install-ps install-ps-am install-strip \
-       installcheck installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-compile \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       tags uninstall uninstall-am uninstall-libexecsubLTLIBRARIES
-
-
-all: $(in_gcc_libs)
+.PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-am \
+       clean clean-generic clean-libexecsubLTLIBRARIES clean-libtool \
+       ctags distclean distclean-compile distclean-generic \
+       distclean-hdr distclean-libtool distclean-tags dvi dvi-am html \
+       html-am info info-am install install-am 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-libexecsubLTLIBRARIES install-man \
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+       pdf pdf-am ps ps-am tags uninstall uninstall-am \
+       uninstall-libexecsubLTLIBRARIES
+
+
+all-local: $(in_gcc_libs)
 
 $(in_gcc_libs) : $(gcc_build_dir)/%: %
        @if test "X`dlname=; . ./$*; echo dlname:$$dlname`" = "Xdlname:"; then \