]> xenbits.xensource.com Git - libvirt.git/commitdiff
build: fix building error when building without libvirtd
authorWen Congyang <wency@cn.fujitsu.com>
Wed, 9 Mar 2011 03:18:36 +0000 (11:18 +0800)
committerEric Blake <eblake@redhat.com>
Wed, 9 Mar 2011 03:33:48 +0000 (20:33 -0700)
When building libvirt without libvirtd, I receive the following errors:
make[1]: Leaving directory `/home/wency/source/test/libvirt/src'
 (cd daemon && make  top_distdir=../libvirt-0.8.8 distdir=../libvirt-0.8.8/daemon \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[1]: Entering directory `/home/wency/source/test/libvirt/daemon'
make[1]: *** No rule to make target `libvirtd.8.in', needed by `distdir'.  Stop.

This bug was caused by commit 6db98a2d.

Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
daemon/Makefile.am

index 912440cf5272deeb7d00bc743a8a30769e8ff8c4..15e8129bf59f6a09f8192d140d0545c708dce43c 100644 (file)
@@ -60,9 +60,6 @@ augeas_DATA = libvirtd.aug
 augeastestsdir = $(datadir)/augeas/lenses/tests
 augeastests_DATA = test_libvirtd.aug
 
-POD2MAN = pod2man -c "Virtualization Support" \
-                       -r "$(PACKAGE)-$(VERSION)" -s 8
-
 libvirtd.8: $(srcdir)/libvirtd.8.in
        sed \
            -e 's![@]sysconfdir[@]!$(sysconfdir)!g' \
@@ -71,9 +68,6 @@ libvirtd.8: $(srcdir)/libvirtd.8.in
            < $< > $@-t
        mv $@-t $@
 
-$(srcdir)/libvirtd.8.in: libvirtd.pod.in
-       $(AM_V_GEN)$(POD2MAN) $< $@
-
 libvirtd_SOURCES = $(DAEMON_SOURCES)
 
 #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L
@@ -330,6 +324,13 @@ install-data-local: install-data-sasl
 uninstall-local:: uninstall-data-sasl
 endif # WITH_LIBVIRTD
 
+# This is needed for 'make dist' too, so can't wrap in WITH_LIBVIRTD.
+POD2MAN = pod2man -c "Virtualization Support" \
+                       -r "$(PACKAGE)-$(VERSION)" -s 8
+
+$(srcdir)/libvirtd.8.in: libvirtd.pod.in
+       $(AM_V_GEN)$(POD2MAN) $< $@
+
 # This is needed for clients too, so can't wrap in
 # the WITH_LIBVIRTD conditional
 if HAVE_SASL