x86: drop a few dead macros

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

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 72ca855eb0713d24902d8e81759e8b689cf90608..7308ea5767424b5bb095b531ed8f99a7d26465a5 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -224,13 +224,9 @@ CODESIGN_CERT = @CODESIGN_CERT@
 GDBFLAGS =
 
 # Helper code from gnulib.
-GNULIB_BUILDDIR = build-gnulib
+GNULIB_BUILDDIR = ../gnulib
 LIBGNU = $(GNULIB_BUILDDIR)/import/libgnu.a
-INCGNU = -I$(srcdir)/gnulib/import -I$(GNULIB_BUILDDIR)/import
-
-# Generated headers in the gnulib directory.  These must be listed
-# so that they are generated before other files are compiled.
-GNULIB_H = $(GNULIB_BUILDDIR)/import/string.h @GNULIB_STDINT_H@
+INCGNU = -I$(srcdir)/../gnulib/import -I$(GNULIB_BUILDDIR)/import
 
 #
 # CLI sub directory definitons
@@ -241,6 +237,7 @@ SUBDIR_CLI_SRCS = \
        cli/cli-dump.c \
        cli/cli-interp.c \
        cli/cli-logging.c \
+       cli/cli-option.c \
        cli/cli-script.c \
        cli/cli-setshow.c \
        cli/cli-style.c \
@@ -411,6 +408,7 @@ SUBDIR_PYTHON_CFLAGS =
 
 SUBDIR_UNITTESTS_SRCS = \
        unittests/array-view-selftests.c \
+       unittests/child-path-selftests.c \
        unittests/cli-utils-selftests.c \
        unittests/common-utils-selftests.c \
        unittests/copy_bitwise-selftests.c \
@@ -923,6 +921,7 @@ COMMON_SFILES = \
        ada-varobj.c \
        addrmap.c \
        agent.c \
+       alloc.c \
        annotate.c \
        arch-utils.c \
        auto-load.c \
@@ -1061,6 +1060,8 @@ COMMON_SFILES = \
        macrotab.c \
        main.c \
        maint.c \
+       maint-test-options.c \
+       maint-test-settings.c \
        mdebugread.c \
        mem-break.c \
        memattr.c \
@@ -1122,7 +1123,6 @@ COMMON_SFILES = \
        test-target.c \
        thread.c \
        thread-iter.c \
-       thread-fsm.c \
        tid-parse.c \
        top.c \
        tracefile.c \
@@ -1131,6 +1131,7 @@ COMMON_SFILES = \
        trad-frame.c \
        tramp-frame.c \
        target-float.c \
+       type-stack.c \
        typeprint.c \
        ui-file.c \
        ui-out.c \
@@ -1406,6 +1407,7 @@ HFILES_NO_SRCDIR = \
        trad-frame.h \
        target-float.h \
        tramp-frame.h \
+       type-stack.h \
        typeprint.h \
        ui-file.h \
        ui-out.h \
@@ -1493,14 +1495,6 @@ HFILES_NO_SRCDIR = \
        config/djgpp/nl_types.h \
        config/i386/nm-i386gnu.h \
        config/sparc/nm-sol2.h \
-       gnulib/import/inttypes.in.h \
-       gnulib/import/stddef.in.h \
-       gnulib/import/stdint.in.h \
-       gnulib/import/str-two-way.h \
-       gnulib/import/string.in.h \
-       gnulib/import/extra/snippet/arg-nonnull.h \
-       gnulib/import/extra/snippet/c++defs.h \
-       gnulib/import/extra/snippet/warn-on-use.h \
        mi/mi-cmds.h \
        mi/mi-common.h \
        mi/mi-console.h \
@@ -1586,14 +1580,14 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
        $(SUBDIR_TARGET_OBS) \
        $(SUBDIR_GCC_COMPILE_OBS)
 
-SUBDIRS = doc @subdirs@ data-directory $(GNULIB_BUILDDIR)
+SUBDIRS = doc @subdirs@ data-directory
 CLEANDIRS = $(SUBDIRS)
 
 # List of subdirectories in the build tree that must exist.
 # This is used to force build failures in existing trees when
 # a new directory is added.
 # The format here is for the `case' shell command.
-REQUIRED_SUBDIRS = doc | testsuite | $(GNULIB_BUILDDIR) | data-directory
+REQUIRED_SUBDIRS = doc | testsuite | data-directory
 
 # Parser intermediate files.
 YYFILES = \
@@ -1623,7 +1617,6 @@ generated_files = \
        config.h \
        gcore \
        jit-reader.h \
-       $(GNULIB_H) \
        $(NAT_GENERATED_FILES)
 
 # Flags needed to compile Python code
@@ -1894,12 +1887,6 @@ ifneq ($(CODESIGN_CERT),)
        $(ECHO_SIGN) $(CODESIGN) -s $(CODESIGN_CERT) gdb$(EXEEXT)
 endif
 
-# Convenience rule to handle recursion.
-$(LIBGNU) $(GNULIB_H): all-lib
-all-lib: $(GNULIB_BUILDDIR)/Makefile
-       @$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=$(GNULIB_BUILDDIR) subdir_do
-.PHONY: all-lib
-
 # Convenience rule to handle recursion.
 .PHONY: all-data-directory
 all-data-directory: data-directory/Makefile
@@ -1956,7 +1943,6 @@ clean mostlyclean: $(CONFIG_CLEAN)
 # always included in SUBDIRS.  Remove the gdbserver files explicitly.
 distclean: clean
        @$(MAKE) $(FLAGS_TO_PASS) DO=distclean "DODIRS=$(CLEANDIRS)" subdir_do
-       rm -rf $(GNULIB_BUILDDIR)
        rm -f gdbserver/config.status gdbserver/config.log
        rm -f gdbserver/tm.h gdbserver/xm.h gdbserver/nm.h
        rm -f gdbserver/Makefile gdbserver/config.cache
@@ -2014,13 +2000,6 @@ Makefile: Makefile.in config.status
          CONFIG_HEADERS= \
          $(SHELL) config.status
 
-$(GNULIB_BUILDDIR)/Makefile: gnulib/Makefile.in config.status
-       @cd $(GNULIB_BUILDDIR); CONFIG_FILES="Makefile" \
-         CONFIG_COMMANDS="depfiles" \
-         CONFIG_HEADERS= \
-         CONFIG_LINKS= \
-         $(SHELL) config.status
-
 data-directory/Makefile: data-directory/Makefile.in config.status
        CONFIG_FILES="data-directory/Makefile" \
          CONFIG_COMMANDS="depfiles" \