From b51fa00f4ec185801655336e8d76b584063e69c1 Mon Sep 17 00:00:00 2001 From: Roger Sayle Date: Mon, 7 Jun 2004 05:18:36 +0000 Subject: [PATCH] Makefile.am (LIBICONV): Declare. * Makefile.am (LIBICONV): Declare. (makedepend_LDADD): Use LIBICONV. * Makefile.in: Regenerate. From-SVN: r82681 --- libcpp/ChangeLog | 6 ++++++ libcpp/Makefile.am | 3 ++- libcpp/Makefile.in | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index a955dea7665..03fe33773c9 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,9 @@ +2004-06-06 Roger Sayle + + * Makefile.am (LIBICONV): Declare. + (makedepend_LDADD): Use LIBICONV. + * Makefile.in: Regenerate. + 2004-06-05 Andrew Pinski * Makefile.am (LIBINTL): Declare diff --git a/libcpp/Makefile.am b/libcpp/Makefile.am index 11dbc16aa10..20e97b852c8 100644 --- a/libcpp/Makefile.am +++ b/libcpp/Makefile.am @@ -14,8 +14,9 @@ noinst_HEADERS = \ include/symtab.h internal.h system.h ucnid.h LIBINTL = @LIBINTL@ +LIBICONV = @LIBICONV@ noinst_PROGRAMS = makedepend -makedepend_LDADD = libcpp.a ../libiberty/libiberty.a $(LIBINTL) +makedepend_LDADD = libcpp.a ../libiberty/libiberty.a $(LIBINTL) $(LIBICONV) XGETTEXT = @XGETTEXT@ GMSGFMT = @GMSGFMT@ diff --git a/libcpp/Makefile.in b/libcpp/Makefile.in index 420edcf47b2..0123c4d9469 100644 --- a/libcpp/Makefile.in +++ b/libcpp/Makefile.in @@ -75,7 +75,7 @@ makedepend_SOURCES = makedepend.c makedepend_OBJECTS = makedepend.$(OBJEXT) am__DEPENDENCIES_1 = makedepend_DEPENDENCIES = libcpp.a ../libiberty/libiberty.a \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/../depcomp am__depfiles_maybe = depfiles @@ -221,7 +221,7 @@ noinst_HEADERS = \ include/cpplib.h include/line-map.h include/mkdeps.h \ include/symtab.h internal.h system.h ucnid.h -makedepend_LDADD = libcpp.a ../libiberty/libiberty.a $(LIBINTL) +makedepend_LDADD = libcpp.a ../libiberty/libiberty.a $(LIBINTL) $(LIBICONV) MSGMERGE = msgmerge all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am -- 2.30.2