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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1b3ae40ddd489e05e4d6a9551065b9bb2a23f7ee..76eaa5fbf6f39ca5bb291b929777cf0547ce6a6a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 9b803ea3dc9a27bd9ee1169a5467ec381007ca38..c70c42c8f00a2eda1fa21f57c5779ed1ffbacfd9 100644 (file)
--- 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