* Makefile.am (LIBICONV): Declare.

	(makedepend_LDADD): Use LIBICONV.
	* Makefile.in: Regenerate.

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

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index a955dea..03fe337 100644 (file)
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-06  Roger Sayle  <roger@eyesopen.com>
+
+       * Makefile.am (LIBICONV): Declare.
+       (makedepend_LDADD): Use LIBICONV.
+       * Makefile.in: Regenerate.
+

 2004-06-05  Andrew Pinski  <pinskia@physics.uc.edu>
 
        * Makefile.am (LIBINTL): Declare
 2004-06-05  Andrew Pinski  <pinskia@physics.uc.edu>
 
        * Makefile.am (LIBINTL): Declare

diff --git a/libcpp/Makefile.am b/libcpp/Makefile.am
index 11dbc16..20e97b8 100644 (file)
--- 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@
        include/symtab.h internal.h system.h ucnid.h
 
 LIBINTL = @LIBINTL@

+LIBICONV = @LIBICONV@

 noinst_PROGRAMS = makedepend
 noinst_PROGRAMS = makedepend

-makedepend_LDADD = libcpp.a ../libiberty/libiberty.a $(LIBINTL)
+makedepend_LDADD = libcpp.a ../libiberty/libiberty.a $(LIBINTL) $(LIBICONV)

 
 XGETTEXT = @XGETTEXT@
 GMSGFMT = @GMSGFMT@
 
 XGETTEXT = @XGETTEXT@
 GMSGFMT = @GMSGFMT@

diff --git a/libcpp/Makefile.in b/libcpp/Makefile.in
index 420edcf..0123c4d 100644 (file)
--- 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 \
 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
 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
 
        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
 MSGMERGE = msgmerge
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-am