2006-05-09 15:35:46 +00:00
|
|
|
## Process this file with automake to produce Makefile.in
|
|
|
|
|
Use gnulib, starting with its physmem and getaddrinfo modules.
New files go into these directories:
gnulib/lib
gnulib/m4
gnulib/tests
* bootstrap: A wrapper around gnulib-tool.
* configure.in: Invoke gl_EARLY and gl_INIT, being careful to put gl_EARLY
before any macro that uses AC_COMPILE_IFELSE.
(AC_OUTPUT): Add lib/Makefile and gl-tests/Makefile. Remove m4/Makefile.
* Makefile.am (SUBDIRS): Add gnulib/lib and remove m4. Add gnulib/tests
early enough that those tests run before any libvirt unit tests.
* m4/Makefile.am: Remove file. Not needed.
* src/Makefile.am (INCLUDES): Add -I$(top_srcdir)/gnulib/lib -I../gnulib/lib.
(LDADDS, libvirt_la_LIBADD): Add ../gnulib/lib/libgnu.la.
* src/nodeinfo.c: Include "physmem.h".
* qemud/qemud.c, src/remote_internal.c: Include "getaddrinfo.h".
(MEMINFO_PATH, linuxNodeInfoMemPopulate): Remove definitions.
(virNodeInfoPopulate): Use physmem_total, not linuxNodeInfoMemPopulate.
* tests/Makefile.am (INCLUDES): Add -I$(top_srcdir)/gnulib/lib -I../gnulib/lib.
(LDADDS): Add ../gnulib/lib/libgnu.la.
* qemud/Makefile.am (libvirtd_LDADD): Add ../gnulib/lib/libgnu.la.
* tests/nodeinfotest.c (linuxTestCompareFiles): No longer read total
memory from a file.
Update expected output not to include "Memory: NNNN"
* tests/nodeinfodata/linux-nodeinfo-1.txt:
* tests/nodeinfodata/linux-nodeinfo-2.txt:
* tests/nodeinfodata/linux-nodeinfo-3.txt:
* tests/nodeinfodata/linux-nodeinfo-4.txt:
* tests/nodeinfodata/linux-nodeinfo-5.txt:
* tests/nodeinfodata/linux-nodeinfo-6.txt:
* src/test.c [WITH_TEST]: Remove definition of _GNU_SOURCE that
would conflict with the one now in "config.h".
* autogen.sh: Add -I gnulib/m4.
* src/conf.c, src/sexpr.c: Don't define _GNU_SOURCE.
Instead, include "config.h".
* qemud/qemud.c: Remove definition of _GNU_SOURCE.
* src/openvz_driver.c: Likewise.
* src/qemu_driver.c: Likewise.
* src/remote_internal.c: Likewise.
* configure.in: Use AC_CONFIG_AUX_DIR(build-aux), so that a bunch
of gettextize-generated files go into build-aux/, rather than in
the top-level directory.
* .cvsignore: Adjust.
* build-aux/.cvsignore: New file.
Author: Jim Meyering <meyering@redhat.com>
2007-12-05 21:31:07 +00:00
|
|
|
SUBDIRS = virshdata confdata sexpr2xmldata \
|
|
|
|
xml2sexprdata xmconfigdata xencapsdata
|
2006-08-24 21:46:28 +00:00
|
|
|
|
2006-05-09 15:35:46 +00:00
|
|
|
INCLUDES = \
|
Use gnulib, starting with its physmem and getaddrinfo modules.
New files go into these directories:
gnulib/lib
gnulib/m4
gnulib/tests
* bootstrap: A wrapper around gnulib-tool.
* configure.in: Invoke gl_EARLY and gl_INIT, being careful to put gl_EARLY
before any macro that uses AC_COMPILE_IFELSE.
(AC_OUTPUT): Add lib/Makefile and gl-tests/Makefile. Remove m4/Makefile.
* Makefile.am (SUBDIRS): Add gnulib/lib and remove m4. Add gnulib/tests
early enough that those tests run before any libvirt unit tests.
* m4/Makefile.am: Remove file. Not needed.
* src/Makefile.am (INCLUDES): Add -I$(top_srcdir)/gnulib/lib -I../gnulib/lib.
(LDADDS, libvirt_la_LIBADD): Add ../gnulib/lib/libgnu.la.
* src/nodeinfo.c: Include "physmem.h".
* qemud/qemud.c, src/remote_internal.c: Include "getaddrinfo.h".
(MEMINFO_PATH, linuxNodeInfoMemPopulate): Remove definitions.
(virNodeInfoPopulate): Use physmem_total, not linuxNodeInfoMemPopulate.
* tests/Makefile.am (INCLUDES): Add -I$(top_srcdir)/gnulib/lib -I../gnulib/lib.
(LDADDS): Add ../gnulib/lib/libgnu.la.
* qemud/Makefile.am (libvirtd_LDADD): Add ../gnulib/lib/libgnu.la.
* tests/nodeinfotest.c (linuxTestCompareFiles): No longer read total
memory from a file.
Update expected output not to include "Memory: NNNN"
* tests/nodeinfodata/linux-nodeinfo-1.txt:
* tests/nodeinfodata/linux-nodeinfo-2.txt:
* tests/nodeinfodata/linux-nodeinfo-3.txt:
* tests/nodeinfodata/linux-nodeinfo-4.txt:
* tests/nodeinfodata/linux-nodeinfo-5.txt:
* tests/nodeinfodata/linux-nodeinfo-6.txt:
* src/test.c [WITH_TEST]: Remove definition of _GNU_SOURCE that
would conflict with the one now in "config.h".
* autogen.sh: Add -I gnulib/m4.
* src/conf.c, src/sexpr.c: Don't define _GNU_SOURCE.
Instead, include "config.h".
* qemud/qemud.c: Remove definition of _GNU_SOURCE.
* src/openvz_driver.c: Likewise.
* src/qemu_driver.c: Likewise.
* src/remote_internal.c: Likewise.
* configure.in: Use AC_CONFIG_AUX_DIR(build-aux), so that a bunch
of gettextize-generated files go into build-aux/, rather than in
the top-level directory.
* .cvsignore: Adjust.
* build-aux/.cvsignore: New file.
Author: Jim Meyering <meyering@redhat.com>
2007-12-05 21:31:07 +00:00
|
|
|
-I$(top_srcdir)/gnulib/lib -I../gnulib/lib \
|
2006-05-09 15:35:46 +00:00
|
|
|
-I$(top_builddir)/include \
|
|
|
|
-I$(top_builddir)/src \
|
2006-05-29 16:05:05 +00:00
|
|
|
-I$(top_srcdir)/include \
|
|
|
|
-I$(top_srcdir)/src \
|
2007-09-19 17:42:40 +00:00
|
|
|
$(LIBXML_CFLAGS) \
|
|
|
|
$(GNUTLS_CFLAGS) \
|
2007-12-05 15:24:15 +00:00
|
|
|
$(SASL_CFLAGS) \
|
2008-02-20 15:38:29 +00:00
|
|
|
$(SELINUX_CFLAGS) \
|
2006-09-21 15:24:37 +00:00
|
|
|
-D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=199506L \
|
2007-02-14 02:12:41 +00:00
|
|
|
-DGETTEXT_PACKAGE=\"$(PACKAGE)\" \
|
2007-03-01 16:18:55 +00:00
|
|
|
$(COVERAGE_CFLAGS) \
|
2007-03-15 07:43:16 +00:00
|
|
|
$(WARN_CFLAGS) \
|
|
|
|
$(LIBVIRT_FEATURES)
|
2007-02-14 02:12:41 +00:00
|
|
|
|
2006-05-09 15:35:46 +00:00
|
|
|
LDADDS = \
|
|
|
|
@STATIC_BINARIES@ \
|
2007-09-19 17:42:40 +00:00
|
|
|
$(LIBXML_LIBS) \
|
|
|
|
$(GNUTLS_LIBS) \
|
2007-12-05 15:24:15 +00:00
|
|
|
$(SASL_LIBS) \
|
2008-02-20 15:38:29 +00:00
|
|
|
$(SELINUX_LIBS) \
|
2007-05-29 14:44:15 +00:00
|
|
|
$(WARN_CFLAGS) \
|
2008-02-28 17:06:32 +00:00
|
|
|
../src/libvirt_test.la \
|
Use gnulib, starting with its physmem and getaddrinfo modules.
New files go into these directories:
gnulib/lib
gnulib/m4
gnulib/tests
* bootstrap: A wrapper around gnulib-tool.
* configure.in: Invoke gl_EARLY and gl_INIT, being careful to put gl_EARLY
before any macro that uses AC_COMPILE_IFELSE.
(AC_OUTPUT): Add lib/Makefile and gl-tests/Makefile. Remove m4/Makefile.
* Makefile.am (SUBDIRS): Add gnulib/lib and remove m4. Add gnulib/tests
early enough that those tests run before any libvirt unit tests.
* m4/Makefile.am: Remove file. Not needed.
* src/Makefile.am (INCLUDES): Add -I$(top_srcdir)/gnulib/lib -I../gnulib/lib.
(LDADDS, libvirt_la_LIBADD): Add ../gnulib/lib/libgnu.la.
* src/nodeinfo.c: Include "physmem.h".
* qemud/qemud.c, src/remote_internal.c: Include "getaddrinfo.h".
(MEMINFO_PATH, linuxNodeInfoMemPopulate): Remove definitions.
(virNodeInfoPopulate): Use physmem_total, not linuxNodeInfoMemPopulate.
* tests/Makefile.am (INCLUDES): Add -I$(top_srcdir)/gnulib/lib -I../gnulib/lib.
(LDADDS): Add ../gnulib/lib/libgnu.la.
* qemud/Makefile.am (libvirtd_LDADD): Add ../gnulib/lib/libgnu.la.
* tests/nodeinfotest.c (linuxTestCompareFiles): No longer read total
memory from a file.
Update expected output not to include "Memory: NNNN"
* tests/nodeinfodata/linux-nodeinfo-1.txt:
* tests/nodeinfodata/linux-nodeinfo-2.txt:
* tests/nodeinfodata/linux-nodeinfo-3.txt:
* tests/nodeinfodata/linux-nodeinfo-4.txt:
* tests/nodeinfodata/linux-nodeinfo-5.txt:
* tests/nodeinfodata/linux-nodeinfo-6.txt:
* src/test.c [WITH_TEST]: Remove definition of _GNU_SOURCE that
would conflict with the one now in "config.h".
* autogen.sh: Add -I gnulib/m4.
* src/conf.c, src/sexpr.c: Don't define _GNU_SOURCE.
Instead, include "config.h".
* qemud/qemud.c: Remove definition of _GNU_SOURCE.
* src/openvz_driver.c: Likewise.
* src/qemu_driver.c: Likewise.
* src/remote_internal.c: Likewise.
* configure.in: Use AC_CONFIG_AUX_DIR(build-aux), so that a bunch
of gettextize-generated files go into build-aux/, rather than in
the top-level directory.
* .cvsignore: Adjust.
* build-aux/.cvsignore: New file.
Author: Jim Meyering <meyering@redhat.com>
2007-12-05 21:31:07 +00:00
|
|
|
../gnulib/lib/libgnu.la \
|
2007-02-14 02:12:41 +00:00
|
|
|
$(COVERAGE_LDFLAGS)
|
2006-05-09 15:35:46 +00:00
|
|
|
|
2007-11-14 10:35:58 +00:00
|
|
|
EXTRA_DIST = \
|
|
|
|
xmlrpcserver.py \
|
|
|
|
test_conf.sh \
|
|
|
|
qemuxml2argvdata \
|
2007-11-15 13:04:28 +00:00
|
|
|
nodeinfodata
|
2006-05-09 15:35:46 +00:00
|
|
|
|
2006-09-21 09:15:33 +00:00
|
|
|
noinst_PROGRAMS = xmlrpctest xml2sexprtest sexpr2xmltest virshtest conftest \
|
2007-07-25 23:16:30 +00:00
|
|
|
reconnect xmconfigtest xencapstest qemuxml2argvtest qemuxml2xmltest \
|
2008-01-29 18:36:00 +00:00
|
|
|
nodeinfotest statstest
|
2006-08-24 15:05:19 +00:00
|
|
|
|
2007-11-14 10:35:58 +00:00
|
|
|
test_scripts = \
|
2007-12-11 21:20:13 +00:00
|
|
|
daemon-conf \
|
2007-11-14 10:35:58 +00:00
|
|
|
int-overflow
|
2007-12-11 21:20:13 +00:00
|
|
|
|
2007-11-14 10:35:58 +00:00
|
|
|
EXTRA_DIST += $(test_scripts)
|
|
|
|
|
2007-07-18 21:34:22 +00:00
|
|
|
TESTS = xml2sexprtest sexpr2xmltest virshtest test_conf.sh xmconfigtest \
|
2007-11-12 14:00:32 +00:00
|
|
|
xencapstest qemuxml2argvtest qemuxml2xmltest nodeinfotest \
|
2008-01-29 18:36:00 +00:00
|
|
|
statstest $(test_scripts)
|
2007-02-07 13:41:44 +00:00
|
|
|
if ENABLE_XEN_TESTS
|
|
|
|
TESTS += reconnect
|
|
|
|
endif
|
2006-05-09 15:35:46 +00:00
|
|
|
|
2008-03-24 10:18:36 +00:00
|
|
|
path_add = $$abs_top_builddir/src$(PATH_SEPARATOR)$$abs_top_builddir/qemud
|
|
|
|
|
2007-11-17 13:16:47 +00:00
|
|
|
# NB, automake < 1.10 does not provide the real
|
|
|
|
# abs_top_{src/build}dir variables, so don't rely
|
|
|
|
# on them here. Fake them with 'pwd'
|
2007-11-12 14:00:32 +00:00
|
|
|
TESTS_ENVIRONMENT = \
|
2008-03-24 10:18:36 +00:00
|
|
|
abs_top_builddir=`cd '$(top_builddir)'; pwd` \
|
|
|
|
abs_top_srcdir=`cd '$(top_srcdir)'; pwd` \
|
|
|
|
PATH="$(path_add)$(PATH_SEPARATOR)$$PATH" \
|
2007-11-12 14:00:32 +00:00
|
|
|
$(VG)
|
|
|
|
|
2006-08-24 16:00:19 +00:00
|
|
|
valgrind:
|
2007-11-12 14:00:32 +00:00
|
|
|
$(MAKE) check VG="valgrind --quiet --leak-check=full"
|
2006-08-24 16:00:19 +00:00
|
|
|
|
2006-05-09 15:35:46 +00:00
|
|
|
# Note: xmlrpc.[c|h] is not in libvirt yet
|
|
|
|
xmlrpctest_SOURCES = \
|
|
|
|
xmlrpctest.c \
|
|
|
|
testutils.c testutils.h \
|
2007-07-04 09:16:23 +00:00
|
|
|
@top_srcdir@/src/xmlrpc.c \
|
|
|
|
@top_srcdir@/src/xmlrpc.h
|
2006-05-09 15:35:46 +00:00
|
|
|
|
|
|
|
xmlrpctest_LDADD = $(LDADDS)
|
|
|
|
|
2006-08-24 15:05:19 +00:00
|
|
|
xml2sexprtest_SOURCES = \
|
|
|
|
xml2sexprtest.c \
|
|
|
|
testutils.c testutils.h
|
|
|
|
xml2sexprtest_LDADD = $(LDADDS)
|
|
|
|
|
|
|
|
sexpr2xmltest_SOURCES = \
|
|
|
|
sexpr2xmltest.c \
|
|
|
|
testutils.c testutils.h
|
|
|
|
sexpr2xmltest_LDADD = $(LDADDS)
|
|
|
|
|
2007-01-19 20:30:05 +00:00
|
|
|
xmconfigtest_SOURCES = \
|
|
|
|
xmconfigtest.c \
|
|
|
|
testutils.c testutils.h
|
|
|
|
xmconfigtest_LDADD = $(LDADDS)
|
|
|
|
|
2007-07-18 21:34:22 +00:00
|
|
|
qemuxml2argvtest_SOURCES = \
|
|
|
|
qemuxml2argvtest.c \
|
|
|
|
testutils.c testutils.h
|
|
|
|
qemuxml2argvtest_LDADD = $(LDADDS)
|
|
|
|
|
|
|
|
qemuxml2xmltest_SOURCES = \
|
|
|
|
qemuxml2xmltest.c \
|
|
|
|
testutils.c testutils.h
|
|
|
|
qemuxml2xmltest_LDADD = $(LDADDS)
|
|
|
|
|
2006-08-24 21:46:28 +00:00
|
|
|
virshtest_SOURCES = \
|
|
|
|
virshtest.c \
|
|
|
|
testutils.c testutils.h
|
|
|
|
virshtest_LDADD = $(LDADDS)
|
|
|
|
|
2006-08-29 22:27:07 +00:00
|
|
|
conftest_SOURCES = \
|
|
|
|
conftest.c
|
|
|
|
conftest_LDADD = $(LDADDS)
|
|
|
|
|
2007-03-27 14:45:17 +00:00
|
|
|
xencapstest_SOURCES = \
|
|
|
|
xencapstest.c testutils.h testutils.c
|
|
|
|
xencapstest_LDADD = $(LDADDS)
|
|
|
|
|
2007-07-25 23:16:30 +00:00
|
|
|
nodeinfotest_SOURCES = \
|
|
|
|
nodeinfotest.c testutils.h testutils.c
|
|
|
|
nodeinfotest_LDADD = $(LDADDS)
|
|
|
|
|
2008-01-29 18:36:00 +00:00
|
|
|
statstest_SOURCES = \
|
|
|
|
statstest.c testutils.h testutils.c
|
|
|
|
statstest_LDADD = $(LDADDS)
|
|
|
|
|
2006-09-21 09:15:33 +00:00
|
|
|
reconnect_SOURCES = \
|
|
|
|
reconnect.c
|
|
|
|
reconnect_LDADD = $(LDADDS)
|
|
|
|
|
2008-02-28 17:06:32 +00:00
|
|
|
CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda
|