aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2017-11-21 12:56:55 -0700
committerTom Tromey <tom@tromey.com>2017-11-27 16:53:24 -0700
commit75787ac19cdf7e8aa9b4c28f9421837ba479cf51 (patch)
tree638ca90be4cf3021b0ad6c013b2d91f3b9a6ae84
parent5c8a943144f6972dc0854f2d01d7cb365b06fceb (diff)
downloadgdb-75787ac19cdf7e8aa9b4c28f9421837ba479cf51.zip
gdb-75787ac19cdf7e8aa9b4c28f9421837ba479cf51.tar.gz
gdb-75787ac19cdf7e8aa9b4c28f9421837ba479cf51.tar.bz2
Move unittests object files to unittests subdirectory
Move the object files corresponding to unittests/*.c to the unittests subdirectory in the build tree. ChangeLog 2017-11-27 Tom Tromey <tom@tromey.com> * Makefile.in (SUBDIR_UNITTESTS_OBS): Redefine. (%.o): Remove unittests rule. (CONFIG_SRC_SUBDIR): Add unittests.
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/Makefile.in21
2 files changed, 8 insertions, 19 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1b3ae40..76eaa5f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2017-11-27 Tom Tromey <tom@tromey.com>
+ * Makefile.in (SUBDIR_UNITTESTS_OBS): Redefine.
+ (%.o): Remove unittests rule.
+ (CONFIG_SRC_SUBDIR): Add unittests.
+
+2017-11-27 Tom Tromey <tom@tromey.com>
+
* Makefile.in (SUBDIR_TUI_OBS): Redefine.
(CONFIG_SRC_SUBDIR): Add tui.
(%.o): Remove tui rule.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 9b803ea..c70c42c 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -494,20 +494,7 @@ SUBDIR_UNITTESTS_SRCS = \
unittests/scoped_restore-selftests.c \
unittests/xml-utils-selftests.c
-SUBDIR_UNITTESTS_OBS = \
- array-view-selftests.o \
- common-utils-selftests.o \
- environ-selftests.o \
- function-view-selftests.o \
- lookup_name_info-selftests.o \
- memory-map-selftests.o \
- memrange-selftests.o \
- offset-type-selftests.o \
- optional-selftests.o \
- ptid-selftests.o \
- rsp-low-selftests.o \
- scoped_restore-selftests.o \
- xml-utils-selftests.o
+SUBDIR_UNITTESTS_OBS = $(patsubst %.c,%.o,$(SUBDIR_UNITTESTS_SRCS))
# Opcodes currently live in one of two places. Either they are in the
# opcode library, typically ../opcodes, or they are in a header file
@@ -598,7 +585,7 @@ CONFIG_INSTALL = @CONFIG_INSTALL@
CONFIG_UNINSTALL = @CONFIG_UNINSTALL@
HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@
-CONFIG_SRC_SUBDIR = arch cli mi compile tui
+CONFIG_SRC_SUBDIR = arch cli mi compile tui unittests
CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR))
# -I. for config files.
@@ -1913,10 +1900,6 @@ $(CONFIG_DEP_SUBDIR):
$(COMPILE) $<
$(POSTCOMPILE)
-%.o: ${srcdir}/unittests/%.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-
# Specify an explicit rule for gdb/common/agent.c, to avoid a clash with the
# object file generate by gdb/agent.c.
common-agent.o: $(srcdir)/common/agent.c