From be3ea0c8c9cfd2d71b0f843320be0cf5ae39cbd2 Mon Sep 17 00:00:00 2001 From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> Date: Wed, 15 Dec 2010 16:56:26 +0000 Subject: [PATCH] Revert last change. From-SVN: r167859 --- lto-plugin/ChangeLog | 4 ++++ lto-plugin/Makefile.am | 6 ++---- lto-plugin/Makefile.in | 9 ++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lto-plugin/ChangeLog b/lto-plugin/ChangeLog index b2011cd56b2..62994fcc553 100644 --- a/lto-plugin/ChangeLog +++ b/lto-plugin/ChangeLog @@ -1,3 +1,7 @@ +2010-12-15 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + Revert last change. + 2010-12-15 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * Makefile.am (liblto_plugin_la_DEPENDENCIES): Define. diff --git a/lto-plugin/Makefile.am b/lto-plugin/Makefile.am index 778f99c6746..ba385c76c6f 100644 --- a/lto-plugin/Makefile.am +++ b/lto-plugin/Makefile.am @@ -13,13 +13,11 @@ AM_CFLAGS = -Wall -Werror libexecsub_LTLIBRARIES = liblto_plugin.la liblto_plugin_la_SOURCES = lto-plugin.c -liblto_plugin_la_DEPENDENCIES = \ - $(if $(wildcard ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,) liblto_plugin_la_LIBADD = \ - $(if $(wildcard ../libiberty/pic/libiberty.a),-L../libiberty/pic -liberty,) + $(if $(wildcard ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,) # Note that we intentionally override the bindir supplied by ACX_LT_HOST_FLAGS liblto_plugin_la_LDFLAGS = $(lt_host_flags) -bindir $(libexecsubdir) \ - $(if $(wildcard ../libiberty/pic/libiberty.a),,-L../libiberty -liberty) + $(if $(wildcard ../libiberty/pic/libiberty.a),,-Wc,../libiberty/libiberty.a) all: copy_lto_plugin diff --git a/lto-plugin/Makefile.in b/lto-plugin/Makefile.in index 3ad4d299c71..ad53a60a903 100644 --- a/lto-plugin/Makefile.in +++ b/lto-plugin/Makefile.in @@ -81,6 +81,8 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(libexecsubdir)" LTLIBRARIES = $(libexecsub_LTLIBRARIES) +liblto_plugin_la_DEPENDENCIES = $(if $(wildcard \ + ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,) am_liblto_plugin_la_OBJECTS = lto-plugin.lo liblto_plugin_la_OBJECTS = $(am_liblto_plugin_la_OBJECTS) liblto_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -230,15 +232,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS) AM_CFLAGS = -Wall -Werror libexecsub_LTLIBRARIES = liblto_plugin.la liblto_plugin_la_SOURCES = lto-plugin.c -liblto_plugin_la_DEPENDENCIES = \ - $(if $(wildcard ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,) - liblto_plugin_la_LIBADD = \ - $(if $(wildcard ../libiberty/pic/libiberty.a),-L../libiberty/pic -liberty,) + $(if $(wildcard ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,) # Note that we intentionally override the bindir supplied by ACX_LT_HOST_FLAGS liblto_plugin_la_LDFLAGS = $(lt_host_flags) -bindir $(libexecsubdir) \ - $(if $(wildcard ../libiberty/pic/libiberty.a),,-L../libiberty -liberty) + $(if $(wildcard ../libiberty/pic/libiberty.a),,-Wc,../libiberty/libiberty.a) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am