summaryrefslogtreecommitdiff
path: root/gdb/gdbserver/Makefile.in
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2019-07-09 08:06:39 -0600
committerTom Tromey <tom@tromey.com>2020-01-14 16:25:02 -0700
commit01027315f54048dbaf03ac37455c2528c72a6d9b (patch)
treec7cab8f936383a1adcb5da0a9493808b643d16ed /gdb/gdbserver/Makefile.in
parentb2ceabe8f0c2056342834b2b3f52f3b015538df3 (diff)
downloadbinutils-gdb-01027315f54048dbaf03ac37455c2528c72a6d9b.tar.gz
Move gdbsupport to the top level
This patch moves the gdbsupport directory to the top level. This is the next step in the ongoing project to move gdbserver to the top level. The bulk of this patch was created by "git mv gdb/gdbsupport gdbsupport". This patch then adds a build system to gdbsupport and wires it into the top level. Then it changes gdb to use the top-level build. gdbserver, on the other hand, is not yet changed. It still does its own build of gdbsupport. ChangeLog 2020-01-14 Tom Tromey <tom@tromey.com> * src-release.sh (GDB_SUPPORT_DIRS): Add gdbsupport. * MAINTAINERS: Add gdbsupport. * configure: Rebuild. * configure.ac (configdirs): Add gdbsupport. * gdbsupport: New directory, move from gdb/gdbsupport. * Makefile.def (host_modules, dependencies): Add gnulib. * Makefile.in: Rebuild. gdb/ChangeLog 2020-01-14 Tom Tromey <tom@tromey.com> * nat/x86-linux-dregs.c: Include configh.h. * nat/linux-ptrace.c: Include configh.h. * nat/linux-btrace.c: Include configh.h. * defs.h: Include config.h, bfd.h. * configure.ac: Don't source common.host. (CONFIG_OBS, CONFIG_SRCS): Remove gdbsupport files. * configure: Rebuild. * acinclude.m4: Update path. * Makefile.in (SUPPORT, LIBSUPPORT, INCSUPPORT): New variables. (CONFIG_SRC_SUBDIR): Remove gdbsupport. (INTERNAL_CFLAGS_BASE): Add INCSUPPORT. (CLIBS): Add LIBSUPPORT. (CDEPS): Likewise. (COMMON_SFILES): Remove gdbsupport files. (HFILES_NO_SRCDIR): Likewise. (stamp-version): Update path to create-version.sh. (ALLDEPFILES): Remove gdbsupport files. gdb/gdbserver/ChangeLog 2020-01-14 Tom Tromey <tom@tromey.com> * server.h: Include config.h. * gdbreplay.c: Include config.h. * configure: Rebuild. * configure.ac: Don't source common.host. * acinclude.m4: Update path. * Makefile.in (INCSUPPORT): New variable. (INCLUDE_CFLAGS): Add INCSUPPORT. (SFILES): Update paths. (version-generated.c): Update path to create-version.sh. (gdbsupport/%-ipa.o, gdbsupport/%.o): Update paths. gdbsupport/ChangeLog 2020-01-14 Tom Tromey <tom@tromey.com> * common-defs.h: Add GDBSERVER case. Update includes. * acinclude.m4, aclocal.m4, config.in, configure, configure.ac, Makefile.am, Makefile.in, README: New files. * Moved from ../gdb/gdbsupport/ Change-Id: I07632e7798635c1bab389bf885971e584fb4bb78
Diffstat (limited to 'gdb/gdbserver/Makefile.in')
-rw-r--r--gdb/gdbserver/Makefile.in64
1 files changed, 33 insertions, 31 deletions
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index d1af55be076..38f30a02770 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -109,6 +109,8 @@ INCGNU = -I$(srcdir)/../../gnulib/import -I$(GNULIB_BUILDDIR)/import
# so that they are generated before other files are compiled.
GNULIB_H = $(GNULIB_BUILDDIR)/import/string.h @GNULIB_STDINT_H@
+INCSUPPORT = -I$(srcdir)/../.. -I../..
+
# All the includes used for CFLAGS and for lint.
# -I. for config files.
# -I${srcdir} for our headers.
@@ -120,7 +122,7 @@ GNULIB_H = $(GNULIB_BUILDDIR)/import/string.h @GNULIB_STDINT_H@
#
INCLUDE_CFLAGS = -I. -I${srcdir} \
-I$(srcdir)/../regformats -I$(srcdir)/.. -I$(INCLUDE_DIR) \
- $(INCGNU)
+ $(INCGNU) $(INCSUPPORT)
# M{H,T}_CFLAGS, if defined, has host- and target-dependent CFLAGS
# from the config/ directory.
@@ -201,32 +203,32 @@ SFILES = \
$(srcdir)/arch/arm-linux.c \
$(srcdir)/arch/ppc-linux-common.c \
$(srcdir)/../alloc.c \
- $(srcdir)/gdbsupport/btrace-common.c \
- $(srcdir)/gdbsupport/buffer.c \
- $(srcdir)/gdbsupport/cleanups.c \
- $(srcdir)/gdbsupport/common-debug.c \
- $(srcdir)/gdbsupport/common-exceptions.c \
- $(srcdir)/gdbsupport/common-inferior.c \
- $(srcdir)/gdbsupport/common-regcache.c \
- $(srcdir)/gdbsupport/common-utils.c \
- $(srcdir)/gdbsupport/errors.c \
- $(srcdir)/gdbsupport/environ.c \
- $(srcdir)/gdbsupport/fileio.c \
- $(srcdir)/gdbsupport/filestuff.c \
- $(srcdir)/gdbsupport/job-control.c \
- $(srcdir)/gdbsupport/gdb-dlfcn.c \
- $(srcdir)/gdbsupport/gdb_tilde_expand.c \
- $(srcdir)/gdbsupport/gdb_vecs.c \
- $(srcdir)/gdbsupport/gdb_wait.c \
- $(srcdir)/gdbsupport/netstuff.c \
- $(srcdir)/gdbsupport/new-op.c \
- $(srcdir)/gdbsupport/pathstuff.c \
- $(srcdir)/gdbsupport/print-utils.c \
- $(srcdir)/gdbsupport/ptid.c \
- $(srcdir)/gdbsupport/rsp-low.c \
- $(srcdir)/gdbsupport/safe-strerror.c \
- $(srcdir)/gdbsupport/tdesc.c \
- $(srcdir)/gdbsupport/xml-utils.c \
+ $(srcdir)/../../gdbsupport/btrace-common.c \
+ $(srcdir)/../../gdbsupport/buffer.c \
+ $(srcdir)/../../gdbsupport/cleanups.c \
+ $(srcdir)/../../gdbsupport/common-debug.c \
+ $(srcdir)/../../gdbsupport/common-exceptions.c \
+ $(srcdir)/../../gdbsupport/common-inferior.c \
+ $(srcdir)/../../gdbsupport/common-regcache.c \
+ $(srcdir)/../../gdbsupport/common-utils.c \
+ $(srcdir)/../../gdbsupport/errors.c \
+ $(srcdir)/../../gdbsupport/environ.c \
+ $(srcdir)/../../gdbsupport/fileio.c \
+ $(srcdir)/../../gdbsupport/filestuff.c \
+ $(srcdir)/../../gdbsupport/job-control.c \
+ $(srcdir)/../../gdbsupport/gdb-dlfcn.c \
+ $(srcdir)/../../gdbsupport/gdb_tilde_expand.c \
+ $(srcdir)/../../gdbsupport/gdb_vecs.c \
+ $(srcdir)/../../gdbsupport/gdb_wait.c \
+ $(srcdir)/../../gdbsupport/netstuff.c \
+ $(srcdir)/../../gdbsupport/new-op.c \
+ $(srcdir)/../../gdbsupport/pathstuff.c \
+ $(srcdir)/../../gdbsupport/print-utils.c \
+ $(srcdir)/../../gdbsupport/ptid.c \
+ $(srcdir)/../../gdbsupport/rsp-low.c \
+ $(srcdir)/../../gdbsupport/safe-strerror.c \
+ $(srcdir)/../../gdbsupport/tdesc.c \
+ $(srcdir)/../../gdbsupport/xml-utils.c \
$(srcdir)/nat/aarch64-sve-linux-ptrace.c \
$(srcdir)/nat/linux-btrace.c \
$(srcdir)/nat/linux-namespaces.c \
@@ -529,8 +531,8 @@ am--refresh:
force:
-version-generated.c: Makefile $(srcdir)/../version.in $(srcdir)/../../bfd/version.h $(srcdir)/../gdbsupport/create-version.sh
- $(ECHO_GEN) $(SHELL) $(srcdir)/../gdbsupport/create-version.sh $(srcdir)/.. \
+version-generated.c: Makefile $(srcdir)/../version.in $(srcdir)/../../bfd/version.h $(srcdir)/../../gdbsupport/create-version.sh
+ $(ECHO_GEN) $(SHELL) $(srcdir)/../../gdbsupport/create-version.sh $(srcdir)/.. \
$(host_alias) $(target_alias) $@
xml-builtin-generated.c: stamp-xml; @true
@@ -588,7 +590,7 @@ arch/%-ipa.o: ../arch/%.c
$(IPAGENT_COMPILE) $<
$(POSTCOMPILE)
-gdbsupport/%-ipa.o: ../gdbsupport/%.c
+gdbsupport/%-ipa.o: ../../gdbsupport/%.c
$(IPAGENT_COMPILE) $<
$(POSTCOMPILE)
@@ -621,7 +623,7 @@ arch/%.o: ../arch/%.c
$(COMPILE) $<
$(POSTCOMPILE)
-gdbsupport/%.o: ../gdbsupport/%.c
+gdbsupport/%.o: ../../gdbsupport/%.c
$(COMPILE) $<
$(POSTCOMPILE)