Update config.guess and config.sub to the latest upstream version

[binutils-gdb.git] / bfd / Makefile.am

diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 8ffdbb12e08159e643ed7265466bd0033b779aa1..03b644261ad26087de0cfdea219cebefd4f59e38 100644 (file)
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -43,9 +43,15 @@ noinst_LTLIBRARIES = libbfd.la
 libbfd_la_LDFLAGS += -rpath $(rpath_bfdlibdir)
 endif
 
+# This is where we get zlib from.  zlibdir is -L../zlib and zlibinc is
+# -I../zlib, unless we were configured with --with-system-zlib, in which
+# case both are empty.
+ZLIB = @zlibdir@ -lz
+ZLIBINC = @zlibinc@
+
 WARN_CFLAGS = @WARN_CFLAGS@
 NO_WERROR = @NO_WERROR@
-AM_CFLAGS = $(WARN_CFLAGS)
+AM_CFLAGS = $(WARN_CFLAGS) $(ZLIBINC)
 AM_CPPFLAGS = -DBINDIR='"$(bindir)"'
 if PLUGINS
 bfdinclude_HEADERS += $(INCDIR)/plugin-api.h
@@ -99,6 +105,7 @@ ALL_MACHINES = \
        cpu-epiphany.lo \
        cpu-fr30.lo \
        cpu-frv.lo \
+       cpu-ft32.lo \
        cpu-h8300.lo \
        cpu-h8500.lo \
        cpu-hppa.lo \
@@ -184,6 +191,7 @@ ALL_MACHINES_CFILES = \
        cpu-epiphany.c \
        cpu-fr30.c \
        cpu-frv.c \
+       cpu-ft32.c \
        cpu-h8300.c \
        cpu-h8500.c \
        cpu-hppa.c \
@@ -323,6 +331,7 @@ BFD32_BACKENDS = \
        elf32-epiphany.lo \
        elf32-fr30.lo \
        elf32-frv.lo \
+       elf32-ft32.lo \
        elf32-gen.lo \
        elf32-h8300.lo \
        elf32-hppa.lo \
@@ -513,6 +522,7 @@ BFD32_BACKENDS_CFILES = \
        elf32-epiphany.c \
        elf32-fr30.c \
        elf32-frv.c \
+       elf32-ft32.c \
        elf32-gen.c \
        elf32-h8300.c \
        elf32-hppa.c \
@@ -836,7 +846,7 @@ ofiles: stamp-ofiles ; @true
 libbfd_la_SOURCES = $(BFD32_LIBS_CFILES)
 EXTRA_libbfd_la_SOURCES = $(CFILES)
 libbfd_la_DEPENDENCIES = $(OFILES) ofiles
-libbfd_la_LIBADD = `cat ofiles` @SHARED_LIBADD@ $(LIBDL)
+libbfd_la_LIBADD = `cat ofiles` @SHARED_LIBADD@ $(LIBDL) $(ZLIB)
 libbfd_la_LDFLAGS += -release `cat libtool-soversion` @SHARED_LDFLAGS@
 
 # libtool will build .libs/libbfd.a.  We create libbfd.a in the build