dmsetup: allow --noflush with status/wait for thin

[lvm2.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 9a470a346cd8e0e8d3bf8cf795cab920196de5d4..5e0b348d863abdbadf0d7c776881c23f714918c0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,10 +32,14 @@ ifeq ("@APPLIB@", "yes")
   SUBDIRS += liblvm
 endif
 
+ifeq ("@BUILD_LVMETAD@", "yes")
+  SUBDIRS += libdaemon
+endif
+
 # FIXME Should use intermediate Makefiles here!
 ifeq ($(MAKECMDGOALS),distclean)
   SUBDIRS = doc include man scripts \
-    lib tools daemons libdm \
+    libdaemon lib tools daemons libdm \
     udev po liblvm test \
     unit-tests/datastruct unit-tests/mm unit-tests/regex
 endif
@@ -45,10 +49,10 @@ DISTCLEAN_TARGETS += config.cache config.log config.status make.tmpl
 include make.tmpl
 
 libdm: include
-lib: libdm
+lib: libdm libdaemon
 liblvm: lib
-daemons: lib tools
-tools: lib device-mapper
+daemons: lib libdaemon tools
+tools: lib libdaemon device-mapper
 po: tools daemons
 
 lib.device-mapper: include.device-mapper
@@ -79,7 +83,7 @@ all: cscope.out
 endif
 DISTCLEAN_TARGETS += cscope.out
 
-check check_cluster check_local unit: all
+check check_cluster check_local check_lvmetad unit: all
        $(MAKE) -C test $(@)
 
 install_system_dirs:
@@ -119,11 +123,10 @@ lcov-reset:
 
 # maybe use subdirs processing to create tracefiles...
 $(LCOV_TRACES):
-       $(LCOV) -b $(basename $@) \
-               -d $(basename $@) -c -o - | $(SED) \
+       $(LCOV) -b $(basename $@) -d $(basename $@) \
+               --ignore-errors source -c -o - | $(SED) \
                -e "s/\(dmeventd_lvm.[ch]\)/plugins\/lvm2\/\1/" \
-               -e "s/\(dmeventd_mirror.c\)/plugins\/mirror\/\1/" \
-               -e "s/\(dmeventd_snapshot.c\)/plugins\/snapshot\/\1/" \
+               -e "s/dmeventd_\(mirror\|snapshot\|thin\|raid\)\.c/plugins\/\1\/dmeventd_\1\.c/" \
                >$@
 
 ifneq ("$(GENHTML)", "")