]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
virtlogd: Fix build without DBus
authorMartin Kletzander <mkletzan@redhat.com>
Fri, 27 Nov 2015 13:00:39 +0000 (14:00 +0100)
committerMartin Kletzander <mkletzan@redhat.com>
Fri, 27 Nov 2015 15:39:46 +0000 (16:39 +0100)
The rule for virrotatingfiletest was defined in DBUS-only block even
though the test does not use DBus at all.  Also DBUS_CFLAGS and
DBUS_LIBS are removed from the rules.  The original error was:

/usr/lib/gcc/x86_64-pc-linux-gnu/5.2.0/../../../../lib64/Scrt1.o: In
function `_start':
(.text+0x20): undefined reference to `main'

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
tests/Makefile.am

index b449286f1fb3a8de2e770bae3d50111b15308cd9..e1e28eca93f1c5ad242261b5714a5d08f5449b69 100644 (file)
@@ -1062,6 +1062,11 @@ virnetdevmock_la_LIBADD = $(GNULIB_LIBS) \
                                           ../src/libvirt.la
 virnetdevmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
 
+virrotatingfiletest_SOURCES = \
+       virrotatingfiletest.c testutils.h testutils.c
+virrotatingfiletest_CFLAGS = $(AM_CFLAGS)
+virrotatingfiletest_LDADD = $(LDADDS)
+
 if WITH_LINUX
 virusbtest_SOURCES = \
        virusbtest.c testutils.h testutils.c
@@ -1101,11 +1106,6 @@ virpolkittest_SOURCES = \
 virpolkittest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 virpolkittest_LDADD = $(LDADDS) $(DBUS_LIBS)
 
-virrotatingfiletest_SOURCES = \
-       virrotatingfiletest.c testutils.h testutils.c
-virrotatingfiletest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
-virrotatingfiletest_LDADD = $(LDADDS) $(DBUS_LIBS)
-
 virsystemdtest_SOURCES = \
        virsystemdtest.c testutils.h testutils.c
 virsystemdtest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)