Fix --enable-libctf and --disable-static

[deliverable/binutils-gdb.git] / gdb / Makefile.in

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index f66affd3e5fe0015f0e41c78272aa3f2f4e80ada..9ae9fe2d1e146611325806283e78025d488458e3 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -154,7 +154,8 @@ INCLUDE_CFLAGS = -I$(INCLUDE_DIR)
 LIBIBERTY = ../libiberty/libiberty.a
 
 # Where is the CTF library?  Typically in ../libctf.
-LIBCTF = ../libctf/.libs/libctf.a
+LIBCTF = @LIBCTF@
+CTF_DEPS = @CTF_DEPS@
 
 # Where is the BFD library?  Typically in ../bfd.
 BFD_DIR = ../bfd
@@ -427,13 +428,13 @@ SELFTESTS_SRCS = \
        unittests/array-view-selftests.c \
        unittests/child-path-selftests.c \
        unittests/cli-utils-selftests.c \
+       unittests/command-def-selftests.c \
        unittests/common-utils-selftests.c \
        unittests/copy_bitwise-selftests.c \
        unittests/environ-selftests.c \
        unittests/filtered_iterator-selftests.c \
        unittests/format_pieces-selftests.c \
        unittests/function-view-selftests.c \
-       unittests/help-doc-selftests.c \
        unittests/lookup_name_info-selftests.c \
        unittests/memory-map-selftests.c \
        unittests/memrange-selftests.c \
@@ -614,7 +615,7 @@ INTERNAL_LDFLAGS = \
 # Libraries and corresponding dependencies for compiling gdb.
 # XM_CLIBS, defined in *config files, have host-dependent libs.
 # LIBIBERTY appears twice on purpose.
-CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(LIBCTF) $(ZLIB) \
+CLIBS = $(SIM) $(READLINE) $(OPCODES) $(LIBCTF) $(BFD) $(ZLIB) \
         $(LIBSUPPORT) $(INTL) $(LIBIBERTY) $(LIBDECNUMBER) \
        $(XM_CLIBS) $(GDBTKLIBS) \
        @LIBS@ @GUILE_LIBS@ @PYTHON_LIBS@ \
@@ -622,7 +623,7 @@ CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(LIBCTF) $(ZLIB) \
        $(WIN32LIBS) $(LIBGNU) $(LIBICONV) \
        $(LIBMPFR) $(SRCHIGH_LIBS) $(LIBXXHASH) $(PTHREAD_LIBS) \
        @LIBDEBUGINFOD@
-CDEPS = $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) $(LIBCTF) \
+CDEPS = $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) $(CTF_DEPS) \
        $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) \
        $(LIBSUPPORT)
 
@@ -955,6 +956,7 @@ COMMON_SFILES = \
        alloc.c \
        annotate.c \
        arch-utils.c \
+       async-event.c \
        auto-load.c \
        auxv.c \
        ax-gdb.c \
@@ -1016,8 +1018,8 @@ COMMON_SFILES = \
        dwarf2/macro.c \
        dwarf2/read.c \
        dwarf2/section.c \
+       dwarf2/stringify.c \
        eval.c \
-       event-loop.c \
        event-top.c \
        exceptions.c \
        exec.c \
@@ -1211,6 +1213,7 @@ HFILES_NO_SRCDIR = \
        arm-linux-tdep.h \
        arm-nbsd-tdep.h \
        arm-tdep.h \
+       async-event.h \
        auto-load.h \
        auxv.h \
        ax.h \
@@ -1251,7 +1254,6 @@ HFILES_NO_SRCDIR = \
        dwarf2/index-common.h \
        dwarf2/loc.h \
        dwarf2/read.h \
-       event-loop.h \
        event-top.h \
        exceptions.h \
        exec.h \
@@ -2005,6 +2007,7 @@ aclocal_m4_deps = \
        transform.m4 \
        ../bfd/bfd.m4 \
        ../config/acinclude.m4 \
+       ../config/enable.m4 \
        ../config/plugins.m4 \
        ../config/lead-dot.m4 \
        ../config/override.m4 \