mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-09-08 16:54:49 +00:00
261e7581b1
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>
128 lines
3.0 KiB
Makefile
128 lines
3.0 KiB
Makefile
## Process this file with automake to produce Makefile.in
|
|
|
|
SUBDIRS = virshdata confdata sexpr2xmldata \
|
|
xml2sexprdata xmconfigdata xencapsdata
|
|
|
|
# Wierd libtool related juju...
|
|
#
|
|
# We explicitly want wildcard here instead of just linking
|
|
# to the libvirt.a file. This ensures that when coverage
|
|
# tests are run, all the output data ends up in the correct
|
|
# location. ie, src/ instead of src/.libs.
|
|
LIBVIRT = $(wildcard $(top_builddir)/src/.libs/libvirt_la-*.o)
|
|
|
|
INCLUDES = \
|
|
-I$(top_srcdir)/gnulib/lib -I../gnulib/lib \
|
|
-I$(top_builddir)/include \
|
|
-I$(top_builddir)/src \
|
|
-I$(top_srcdir)/include \
|
|
-I$(top_srcdir)/src \
|
|
$(LIBXML_CFLAGS) \
|
|
$(GNUTLS_CFLAGS) \
|
|
$(SASL_CFLAGS) \
|
|
-D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=199506L \
|
|
-DGETTEXT_PACKAGE=\"$(PACKAGE)\" \
|
|
$(COVERAGE_CFLAGS) \
|
|
$(WARN_CFLAGS) \
|
|
$(LIBVIRT_FEATURES)
|
|
|
|
LDADDS = \
|
|
@STATIC_BINARIES@ \
|
|
$(LIBXML_LIBS) \
|
|
$(GNUTLS_LIBS) \
|
|
$(SASL_LIBS) \
|
|
$(WARN_CFLAGS) \
|
|
$(LIBVIRT) \
|
|
../gnulib/lib/libgnu.la \
|
|
$(COVERAGE_LDFLAGS)
|
|
|
|
EXTRA_DIST = \
|
|
xmlrpcserver.py \
|
|
test_conf.sh \
|
|
qemuxml2argvdata \
|
|
nodeinfodata
|
|
|
|
noinst_PROGRAMS = xmlrpctest xml2sexprtest sexpr2xmltest virshtest conftest \
|
|
reconnect xmconfigtest xencapstest qemuxml2argvtest qemuxml2xmltest \
|
|
nodeinfotest
|
|
|
|
test_scripts = \
|
|
int-overflow
|
|
EXTRA_DIST += $(test_scripts)
|
|
|
|
TESTS = xml2sexprtest sexpr2xmltest virshtest test_conf.sh xmconfigtest \
|
|
xencapstest qemuxml2argvtest qemuxml2xmltest nodeinfotest \
|
|
$(test_scripts)
|
|
if ENABLE_XEN_TESTS
|
|
TESTS += reconnect
|
|
endif
|
|
|
|
# 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'
|
|
TESTS_ENVIRONMENT = \
|
|
abs_top_builddir=`pwd`/'$(top_builddir)' \
|
|
abs_top_srcdir=`pwd`/'$(top_srcdir)' \
|
|
$(VG)
|
|
|
|
valgrind:
|
|
$(MAKE) check VG="valgrind --quiet --leak-check=full"
|
|
|
|
# Note: xmlrpc.[c|h] is not in libvirt yet
|
|
xmlrpctest_SOURCES = \
|
|
xmlrpctest.c \
|
|
testutils.c testutils.h \
|
|
@top_srcdir@/src/xmlrpc.c \
|
|
@top_srcdir@/src/xmlrpc.h
|
|
|
|
xmlrpctest_LDADD = $(LDADDS)
|
|
|
|
xml2sexprtest_SOURCES = \
|
|
xml2sexprtest.c \
|
|
testutils.c testutils.h
|
|
xml2sexprtest_LDADD = $(LDADDS)
|
|
|
|
sexpr2xmltest_SOURCES = \
|
|
sexpr2xmltest.c \
|
|
testutils.c testutils.h
|
|
sexpr2xmltest_LDADD = $(LDADDS)
|
|
|
|
xmconfigtest_SOURCES = \
|
|
xmconfigtest.c \
|
|
testutils.c testutils.h
|
|
xmconfigtest_LDADD = $(LDADDS)
|
|
|
|
qemuxml2argvtest_SOURCES = \
|
|
qemuxml2argvtest.c \
|
|
testutils.c testutils.h
|
|
qemuxml2argvtest_LDADD = $(LDADDS)
|
|
|
|
qemuxml2xmltest_SOURCES = \
|
|
qemuxml2xmltest.c \
|
|
testutils.c testutils.h
|
|
qemuxml2xmltest_LDADD = $(LDADDS)
|
|
|
|
virshtest_SOURCES = \
|
|
virshtest.c \
|
|
testutils.c testutils.h
|
|
virshtest_LDADD = $(LDADDS)
|
|
|
|
conftest_SOURCES = \
|
|
conftest.c
|
|
conftest_LDADD = $(LDADDS)
|
|
|
|
xencapstest_SOURCES = \
|
|
xencapstest.c testutils.h testutils.c
|
|
xencapstest_LDADD = $(LDADDS)
|
|
|
|
nodeinfotest_SOURCES = \
|
|
nodeinfotest.c testutils.h testutils.c
|
|
nodeinfotest_LDADD = $(LDADDS)
|
|
|
|
reconnect_SOURCES = \
|
|
reconnect.c
|
|
reconnect_LDADD = $(LDADDS)
|
|
|
|
$(LIBVIRT):
|
|
-@(cd $(top_builddir)/src && $(MAKE) MAKEFLAGS+=--silent)
|