diff options
| author | Tom Tromey <tromey@redhat.com> | 2009-03-25 00:58:37 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2009-03-25 00:58:37 +0000 |
| commit | fc3b640d978b8b07680feb80a69ddd8c05ee69bd (patch) | |
| tree | 92abfc36a7dcea9da711c8e3d4db835f08df9b0c /gdb/Makefile.in | |
| parent | b5fe7cfc58a3c8ea9be1aaedef6e441462340d10 (diff) | |
| download | gdb-fc3b640d978b8b07680feb80a69ddd8c05ee69bd.zip gdb-fc3b640d978b8b07680feb80a69ddd8c05ee69bd.tar.gz gdb-fc3b640d978b8b07680feb80a69ddd8c05ee69bd.tar.bz2 | |
2009-03-24 Tom Tromey <tromey@redhat.com>
Pedro Alves <pedro@codesourcery.com>
* configure, config.in: Rebuild.
* configure.ac: Check for libiconvlist.
* charset.c: Check HAVE_LIBICONVLIST.
* acinclude.m4 (AM_ICONV): Don't subst LIBICONV, LIBICONV_INCLUDE,
LIBICONV_LIBDIR. Update CPPFLAGS and LIBS.
* Makefile.in (LIBICONV, LIBICONV_INCLUDE, LIBICONV_LIBDIR):
Remove.
(INTERNAL_CFLAGS_BASE): Update.
(INTERNAL_LDFLAGS): Update.
(CLIBS): Update.
Diffstat (limited to 'gdb/Makefile.in')
| -rw-r--r-- | gdb/Makefile.in | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 95b95a1..6b69881 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -163,11 +163,6 @@ INTL = @LIBINTL@ INTL_DEPS = @LIBINTL_DEP@ INTL_CFLAGS = @INCINTL@ -# Where is the ICONV library? This can be empty if libc has iconv. -LIBICONV = @LIBICONV@ -LIBICONV_INCLUDE = @LIBICONV_INCLUDE@ -LIBICONV_LIBDIR = @LIBICONV_LIBDIR@ - # Did the user give us a --with-sysroot option? TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@ @@ -392,8 +387,7 @@ INTERNAL_CFLAGS_BASE = \ $(CFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \ $(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) \ $(BFD_CFLAGS) $(INCLUDE_CFLAGS) $(LIBDECNUMBER_CFLAGS) \ - $(INTL_CFLAGS) $(INCGNU) $(ENABLE_CFLAGS) $(INTERNAL_CPPFLAGS) \ - $(LIBICONV_INCLUDE) + $(INTL_CFLAGS) $(INCGNU) $(ENABLE_CFLAGS) $(INTERNAL_CPPFLAGS) INTERNAL_WARN_CFLAGS = $(INTERNAL_CFLAGS_BASE) $(GDB_WARN_CFLAGS) INTERNAL_CFLAGS = $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS) @@ -405,7 +399,7 @@ LDFLAGS = @LDFLAGS@ # I think it's perfectly reasonable for a user to set -pg in CFLAGS # and have it work; that's why CFLAGS is here. # PROFILE_CFLAGS is _not_ included, however, because we use monstartup. -INTERNAL_LDFLAGS = $(CFLAGS) $(GLOBAL_CFLAGS) $(MH_LDFLAGS) $(LDFLAGS) $(CONFIG_LDFLAGS) $(LIBICONV_LIBDIR) +INTERNAL_LDFLAGS = $(CFLAGS) $(GLOBAL_CFLAGS) $(MH_LDFLAGS) $(LDFLAGS) $(CONFIG_LDFLAGS) # If your system is missing alloca(), or, more likely, it's there but # it doesn't work, then refer to libiberty. @@ -420,7 +414,7 @@ INSTALLED_LIBS=-lbfd -lreadline -lopcodes -liberty -ldecnumber \ -lintl -liberty $(LIBGNU) CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(INTL) $(LIBIBERTY) $(LIBDECNUMBER) \ $(XM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \ - $(LIBICONV) $(LIBEXPAT) \ + $(LIBEXPAT) \ $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU) CDEPS = $(XM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) \ $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) |