Skip to content

L
lxc
Commit abd4a3b3 by dlezcano
Options

Disable test compilation by default

From: Daniel Lezcano <dlezcano@fr.ibm.com> Disable the test programs compilation by default in order to reduce the compilation time when generating rpm and dist. Signed-off-by: 's avatarDaniel Lezcano <dlezcano@fr.ibm.com>
parent 7f989f01
Showing with 9 additions and 2 deletions
Makefile.am
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
SUBDIRS = doc src test etc SUBDIRS = doc src test etc
DIST_SUBDIRS = config doc src test etc DIST_SUBDIRS = config doc src test etc
EXTRA_DIST = lxc.spec CONTRIBUTING MAINTAINERS EXTRA_DIST = lxc.spec CONTRIBUTING MAINTAINERS ChangeLog
ChangeLog:: ChangeLog::
@touch ChangeLog @touch ChangeLog
dist-hook: dist-hook:
-@cvs2cl -@cvs2cl
@cp ChangeLog $(distdir) @mv ChangeLog $(distdir)
rpm: dist rpm: dist
rpmbuild --clean -ta ${distdir}.tar.gz rpmbuild --clean -ta ${distdir}.tar.gz
......
configure.in
...@@ -34,6 +34,8 @@ AC_ARG_ENABLE(network_destroy, [ --disable-network-destroy disable network des ...@@ -34,6 +34,8 @@ AC_ARG_ENABLE(network_destroy, [ --disable-network-destroy disable network des
if test "x$enable_network_destroy" = "xyes"; then if test "x$enable_network_destroy" = "xyes"; then
CFLAGS="$CFLAGS -DNETWORK_DESTROY" CFLAGS="$CFLAGS -DNETWORK_DESTROY"
fi fi
AC_ARG_ENABLE(test, [ --enable-test compile test program [default=no]],, enable_test=no)
AM_CONDITIONAL(ENABLE_TEST, test x$enable_test = xyes)
AC_SUBST(LXC_MAJOR_VERSION) AC_SUBST(LXC_MAJOR_VERSION)
AC_SUBST(LXC_MINOR_VERSION) AC_SUBST(LXC_MINOR_VERSION)
......
test/Makefile.am
if ENABLE_TEST
INCLUDES= -I$(top_srcdir)/src INCLUDES= -I$(top_srcdir)/src
noinst_PROGRAMS = \ noinst_PROGRAMS = \
...@@ -93,3 +95,5 @@ lxc_low_monitor_LDADD = \ ...@@ -93,3 +95,5 @@ lxc_low_monitor_LDADD = \
lxc_state_SOURCES = lxc_state.c lxc_state_SOURCES = lxc_state.c
lxc_state_LDADD = \ lxc_state_LDADD = \
$(top_builddir)/src/lxc/liblxc.la $(top_builddir)/src/lxc/liblxc.la
endif
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment