summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-07-14 11:20:01 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-07-14 11:40:46 +1000
commit4b93413b2a490a74de2e27b37268332b609ac872 (patch)
tree698bc442a987125ca0542d5239ff6a26fefa5fc7
parente2226f3cd7d1bef598f9657b756a171b02f1a299 (diff)
Add test subdir to base Makefile.am
If unittests are enabled, make will build those as well - spotting potential build errors in the tests faster. Furthermore, this allows for the tests to be run from the top-level directory. This patch removes the "run make check to build the test suite" message since that'd pop up after every build now. If unittests are disabled, this change has no effect. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--Makefile.am3
-rw-r--r--test/Makefile.am3
2 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index dea6fa47c..4ee1e179d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,8 @@ SUBDIRS = \
$(GLX_DIR) \
exa \
config \
- hw
+ hw \
+ test
aclocaldir = $(datadir)/aclocal
aclocal_DATA = xorg-server.m4
diff --git a/test/Makefile.am b/test/Makefile.am
index dbad93bb1..c5fc4cd30 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -33,7 +33,4 @@ CLEANFILES=libxservertest.c
libxservertest.c:
touch $@
-all:
- @echo "Run 'make check' to run the test suite"
-
endif