diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-07-05 08:01:41 +0200 |
|---|---|---|
| committer | Henrik Rydberg <rydberg@euromail.se> | 2010-07-05 08:13:14 +0200 |
| commit | 3557acb6a9eec0c0d752a1f3d783b5f50bc19e1b (patch) | |
| tree | 6a7835c623b1bcfa60df6ec815fc698cfb1577ba | |
| parent | 8da65965093ce2515dd0ce828a6512f24f5f5ca9 (diff) | |
Build test utilities unconditionally, do not install
The test programs in the package are command-line utilities which can
be used to generate MT code mappings for header files, and debug
hardware problems, and should not be installed. With this patch, tests
are built unconditionally, but not installed.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | test/Makefile.am | 6 |
2 files changed, 1 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index b802fa4..7e994b6 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -21,14 +21,6 @@ AC_PROG_LIBTOOL | |||
| 21 | AC_PROG_CC | 21 | AC_PROG_CC |
| 22 | AC_PROG_INSTALL | 22 | AC_PROG_INSTALL |
| 23 | 23 | ||
| 24 | # Optional test build | ||
| 25 | AC_ARG_ENABLE(test, | ||
| 26 | AC_HELP_STRING([--enable-test], | ||
| 27 | [Build test programs [[default=auto]]]), | ||
| 28 | [build_test="$enableval"], | ||
| 29 | [build_test="auto"]) | ||
| 30 | AM_CONDITIONAL(BUILD_TEST, [ test "$build_test" != "no" ]) | ||
| 31 | |||
| 32 | # Initialize X.Org macros | 24 | # Initialize X.Org macros |
| 33 | m4_ifndef([XORG_MACROS_VERSION], | 25 | m4_ifndef([XORG_MACROS_VERSION], |
| 34 | [m4_fatal([must install xorg-macros 1.5 or later before running autoconf/autogen])]) | 26 | [m4_fatal([must install xorg-macros 1.5 or later before running autoconf/autogen])]) |
diff --git a/test/Makefile.am b/test/Makefile.am index f550235..2eec163 100644 --- a/test/Makefile.am +++ b/test/Makefile.am | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | if BUILD_TEST | 1 | noinst_PROGRAMS = mtdev-mapgen mtdev |
| 2 | |||
| 3 | bin_PROGRAMS = mtdev-mapgen mtdev | ||
| 4 | 2 | ||
| 5 | INCLUDES=-I$(top_srcdir)/include/ | 3 | INCLUDES=-I$(top_srcdir)/include/ |
| 6 | 4 | ||
| @@ -8,5 +6,3 @@ mtdev_mapgen_SOURCES = mtdev-mapgen.c | |||
| 8 | 6 | ||
| 9 | mtdev_SOURCES = mtdev.c | 7 | mtdev_SOURCES = mtdev.c |
| 10 | mtdev_LDFLAGS = -lmtdev -L$(top_builddir)/src/.libs/ | 8 | mtdev_LDFLAGS = -lmtdev -L$(top_builddir)/src/.libs/ |
| 11 | |||
| 12 | endif | ||
