diff options
| author | Nick Clifton <nickc@redhat.com> | 2007-06-26 14:39:52 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2007-06-26 14:39:52 +0000 |
| commit | 0e65511ebe1087013bc746d3d49c2c9c03da23d2 (patch) | |
| tree | a2a3fc176a4b9a1cc055f296f1cbe1c05e8ab99c /binutils | |
| parent | 7056e928f74587934ef1c1944a3424dbf6dc2d68 (diff) | |
| download | binutils-redhat-0e65511ebe1087013bc746d3d49c2c9c03da23d2.tar.gz | |
PR binutils/4693
* Makefile.am (windres_DEPENDENCIES, windmc_DEPENDENCIES): Move dependency on $(LIBICONV) to ...
(windres_LDADD, windmc_LDADD) ... here.
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 10 | ||||
| -rw-r--r-- | binutils/Makefile.am | 8 | ||||
| -rw-r--r-- | binutils/Makefile.in | 8 |
3 files changed, 17 insertions, 9 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 99e4de8785..d5a6c5ce7d 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,11 @@ +2007-06-26 Shantonu Sen <ssen@apple.com> + + PR binutils/4693 + * Makefile.am (windres_DEPENDENCIES, windmc_DEPENDENCIES): Move + dependency on $(LIBICONV) to ... + (windres_LDADD, windmc_LDADD) ... here. + * Makefile.in: Regenerate. + 2007-06-21 Alan Modra <amodra@bigpond.net.au> * embedspu.sh (relas): Correct sh_info parsing. @@ -6,7 +14,7 @@ * objdump.c: Include sys/stat.h. -2007-06-19 Kai Tietz <kai.tietz@onevision.com> +2007-06-19 Kai Tietz <kai.tietz@onevision.com> * Makefile.am: Add windmc tool. * Makefile.in: Regenerate. diff --git a/binutils/Makefile.am b/binutils/Makefile.am index 24a34fd73e..4ecd8e5841 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -200,8 +200,8 @@ srconv_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) sysdump_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) coffdump_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) dlltool_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) -windres_DEPENDENCIES = $(LIBINTL_DEP) $(LIBICONV) $(LIBIBERTY) $(BFDLIB) -windmc_DEPENDENCIES = $(LIBINTL_DEP) $(LIBICONV) $(LIBIBERTY) $(BFDLIB) +windres_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +windmc_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) addr2line_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) readelf_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) dllwrap_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) @@ -345,11 +345,11 @@ nlmconv_SOURCES = nlmconv.c nlmheader.y $(BULIBS) windres_SOURCES = windres.c resrc.c rescoff.c resbin.c rcparse.y rclex.c \ winduni.c resres.c $(BULIBS) -windres_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL) +windres_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL) $(LIBICONV) windmc_SOURCES = windmc.c mcparse.y mclex.c \ winduni.c $(BULIBS) -windmc_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL) +windmc_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL) $(LIBICONV) dllwrap_SOURCES = dllwrap.c version.c dllwrap_LDADD = $(LIBIBERTY) $(LIBINTL) diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 6ce70d5ffc..449841de14 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -468,8 +468,8 @@ srconv_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) sysdump_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) coffdump_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) dlltool_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) -windres_DEPENDENCIES = $(LIBINTL_DEP) $(LIBICONV) $(LIBIBERTY) $(BFDLIB) -windmc_DEPENDENCIES = $(LIBINTL_DEP) $(LIBICONV) $(LIBIBERTY) $(BFDLIB) +windres_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) +windmc_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) addr2line_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) readelf_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) dllwrap_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) @@ -502,11 +502,11 @@ nlmconv_SOURCES = nlmconv.c nlmheader.y $(BULIBS) windres_SOURCES = windres.c resrc.c rescoff.c resbin.c rcparse.y rclex.c \ winduni.c resres.c $(BULIBS) -windres_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL) +windres_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL) $(LIBICONV) windmc_SOURCES = windmc.c mcparse.y mclex.c \ winduni.c $(BULIBS) -windmc_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL) +windmc_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL) $(LIBICONV) dllwrap_SOURCES = dllwrap.c version.c dllwrap_LDADD = $(LIBIBERTY) $(LIBINTL) EXTRA_DIST = arparse.c arparse.h arlex.c nlmheader.c sysinfo.c sysinfo.h \ |