build: ensure Makefile.inc.am is checked for long lines

The filename match rule was accidentally excluding the
Makefile.inc.am files from the long lines check.

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/cfg.mk b/cfg.mk
index a7c883830f681e27ee0671b80a5c73aeaa38c1bc..3731a2830bb6ecaafe00619b422188645c68739f 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -737,7 +737,7 @@ sc_prohibit_long_lines:
        halt='Wrap long lines in expected output files' \
          $(_sc_search_regexp)
        @prohibit='.{80}' \
-       in_vc_files='Makefile\.am' \
+       in_vc_files='Makefile(\.inc)?\.am' \
        halt='Wrap long lines in Makefiles' \
          $(_sc_search_regexp)
 

diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am
index a88df0bd11648bac952d046a1838a2bcd991a63a..baa85b4ba968e902979a3e72340f56221ddb4311 100644 (file)
--- a/src/interface/Makefile.inc.am
+++ b/src/interface/Makefile.inc.am
@@ -75,10 +75,12 @@ VIRTINTERFACED_UNIT_VARS = \
        -e 's|[@]sockprefix[@]|virtinterfaced|g' \
        $(NULL)
 
-virtinterfaced.service: interface/virtinterfaced.service.in $(top_builddir)/config.status
+virtinterfaced.service: interface/virtinterfaced.service.in \
+               $(top_builddir)/config.status
        $(AM_V_GEN)$(SED) $(VIRTINTERFACED_UNIT_VARS) $< > $@-t && mv $@-t $@
 
-virtinterface%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+virtinterface%.socket: remote/libvirt%.socket.in \
+               $(top_builddir)/config.status
        $(AM_V_GEN)$(SED) $(VIRTINTERFACED_UNIT_VARS) $< > $@-t && mv $@-t $@
 
 interface/virtinterfaced.conf: remote/libvirtd.conf.in

diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index a2151162e6e33cdc27aa32d8cdef2929b440147d..c53396b7f355162fe58fa4997bdac6bee1947ed5 100644 (file)
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -80,9 +80,12 @@ SYSTEMD_UNIT_FILES_IN += \
        libxl/virtxend.service.in \
        $(NULL)
 
+LIBXL_UNIT_COND = ConditionPathExists=/proc/xen/capabilities
+LIBXL_UNIT_CONFLICT = Conflicts=$(LIBVIRTD_SOCKET_UNIT_FILES)
+
 VIRTXEND_UNIT_VARS = \
        $(COMMON_UNIT_VARS) \
-       -e 's|[@]deps[@]|Conflicts=$(LIBVIRTD_SOCKET_UNIT_FILES)\nConditionPathExists=/proc/xen/capabilities|g' \
+       -e 's|[@]deps[@]|$(LIBXL_UNIT_CONFLICT)\n$(LIBXL_UNIT_COND)|g' \
        -e 's|[@]name[@]|Libvirt libxl|g' \
        -e 's|[@]service[@]|virtxend|g' \
        -e 's|[@]sockprefix[@]|virtxend|g' \

diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
index 9f20dad7b3aa92ab15bb53545f479ea962afb4db..17467a65ad18ddc1ad0b0c757c118c04ff4a34b8 100644 (file)
--- a/src/network/Makefile.inc.am
+++ b/src/network/Makefile.inc.am
@@ -82,10 +82,12 @@ VIRTNETWORKD_UNIT_VARS = \
        -e 's|[@]sockprefix[@]|virtnetworkd|g' \
        $(NULL)
 
-virtnetworkd.service: network/virtnetworkd.service.in $(top_builddir)/config.status
+virtnetworkd.service: network/virtnetworkd.service.in \
+               $(top_builddir)/config.status
        $(AM_V_GEN)$(SED) $(VIRTNETWORKD_UNIT_VARS) $< > $@-t && mv $@-t $@
 
-virtnetwork%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+virtnetwork%.socket: remote/libvirt%.socket.in \
+               $(top_builddir)/config.status
        $(AM_V_GEN)$(SED) $(VIRTNETWORKD_UNIT_VARS) $< > $@-t && mv $@-t $@
 
 network/virtnetworkd.conf: remote/libvirtd.conf.in

diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am
index 5a6525d843407c29eeba654a43300fa7be693f10..eac7f92e88d1e37c6f5da3c316c7c89ec9606bab 100644 (file)
--- a/src/node_device/Makefile.inc.am
+++ b/src/node_device/Makefile.inc.am
@@ -98,10 +98,12 @@ VIRTNODEDEVD_UNIT_VARS = \
        -e 's|[@]sockprefix[@]|virtnodedevd|g' \
        $(NULL)
 
-virtnodedevd.service: node_device/virtnodedevd.service.in $(top_builddir)/config.status
+virtnodedevd.service: node_device/virtnodedevd.service.in \
+               $(top_builddir)/config.status
        $(AM_V_GEN)$(SED) $(VIRTNODEDEVD_UNIT_VARS) $< > $@-t && mv $@-t $@
 
-virtnodedev%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+virtnodedev%.socket: remote/libvirt%.socket.in \
+               $(top_builddir)/config.status
        $(AM_V_GEN)$(SED) $(VIRTNODEDEVD_UNIT_VARS) $< > $@-t && mv $@-t $@
 
 node_device/virtnodedevd.conf: remote/libvirtd.conf.in

diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am
index 7693634e291de4c44ec4b3afec76c430128b0e61..6acb45705c85d2340c4c274b6a31432e43afde82 100644 (file)
--- a/src/nwfilter/Makefile.inc.am
+++ b/src/nwfilter/Makefile.inc.am
@@ -83,10 +83,12 @@ VIRTNWFILTERD_UNIT_VARS = \
        -e 's|[@]sockprefix[@]|virtnwfilterd|g' \
        $(NULL)
 
-virtnwfilterd.service: nwfilter/virtnwfilterd.service.in $(top_builddir)/config.status
+virtnwfilterd.service: nwfilter/virtnwfilterd.service.in \
+               $(top_builddir)/config.status
        $(AM_V_GEN)$(SED) $(VIRTNWFILTERD_UNIT_VARS) $< > $@-t && mv $@-t $@
 
-virtnwfilter%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+virtnwfilter%.socket: remote/libvirt%.socket.in \
+               $(top_builddir)/config.status
        $(AM_V_GEN)$(SED) $(VIRTNWFILTERD_UNIT_VARS) $< > $@-t && mv $@-t $@
 
 nwfilter/virtnwfilterd.conf: remote/libvirtd.conf.in

diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am
index 37f816406ec19c0e09bb4cb6a67fccf994e632a6..76bc67418c0005d5520c958c3fa1200d2763319b 100644 (file)
--- a/src/secret/Makefile.inc.am
+++ b/src/secret/Makefile.inc.am
@@ -71,10 +71,12 @@ VIRTSECRETD_UNIT_VARS = \
        -e 's|[@]sockprefix[@]|virtsecretd|g' \
        $(NULL)
 
-virtsecretd.service: secret/virtsecretd.service.in $(top_builddir)/config.status
+virtsecretd.service: secret/virtsecretd.service.in \
+               $(top_builddir)/config.status
        $(AM_V_GEN)$(SED) $(VIRTSECRETD_UNIT_VARS) $< > $@-t && mv $@-t $@
 
-virtsecret%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+virtsecret%.socket: remote/libvirt%.socket.in \
+               $(top_builddir)/config.status
        $(AM_V_GEN)$(SED) $(VIRTSECRETD_UNIT_VARS) $< > $@-t && mv $@-t $@
 
 secret/virtsecretd.conf: remote/libvirtd.conf.in

diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index fd0d57d2b6cd7919efa649247ca1706ba9d96c7f..4dccb14ac1adb6c1ec605d8ad96f14fbaa83f254 100644 (file)
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -175,10 +175,12 @@ VIRTSTORAGED_UNIT_VARS = \
        -e 's|[@]sockprefix[@]|virtstoraged|g' \
        $(NULL)
 
-virtstoraged.service: storage/virtstoraged.service.in $(top_builddir)/config.status
+virtstoraged.service: storage/virtstoraged.service.in \
+               $(top_builddir)/config.status
        $(AM_V_GEN)$(SED) $(VIRTSTORAGED_UNIT_VARS) $< > $@-t && mv $@-t $@
 
-virtstorage%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+virtstorage%.socket: remote/libvirt%.socket.in \
+               $(top_builddir)/config.status
        $(AM_V_GEN)$(SED) $(VIRTSTORAGED_UNIT_VARS) $< > $@-t && mv $@-t $@
 
 storage/virtstoraged.conf: remote/libvirtd.conf.in
@@ -264,7 +266,8 @@ libvirt_storage_backend_iscsi_la_LIBADD = \
 endif WITH_STORAGE_ISCSI
 
 if WITH_STORAGE_ISCSI_DIRECT
-libvirt_storage_backend_iscsi_direct_la_SOURCES = $(STORAGE_DRIVER_ISCSI_DIRECT_SOURCES)
+libvirt_storage_backend_iscsi_direct_la_SOURCES = \
+       $(STORAGE_DRIVER_ISCSI_DIRECT_SOURCES)
 libvirt_storage_backend_iscsi_direct_la_CFLAGS = \
        -I$(srcdir)/conf \
        -I$(srcdir)/secret \
@@ -346,13 +349,15 @@ libvirt_storage_backend_rbd_la_LDFLAGS = $(AM_LDFLAGS_MOD)
 endif WITH_STORAGE_RBD
 
 if WITH_STORAGE_SHEEPDOG
-libvirt_storage_backend_sheepdog_la_SOURCES = $(STORAGE_DRIVER_SHEEPDOG_SOURCES)
+libvirt_storage_backend_sheepdog_la_SOURCES = \
+       $(STORAGE_DRIVER_SHEEPDOG_SOURCES)
 libvirt_storage_backend_sheepdog_la_CFLAGS = \
        -I$(srcdir)/conf \
        $(AM_CFLAGS) \
        $(NULL)
 
-libvirt_storage_backend_sheepdog_priv_la_SOURCES = $(STORAGE_DRIVER_SHEEPDOG_SOURCES)
+libvirt_storage_backend_sheepdog_priv_la_SOURCES = \
+       $(STORAGE_DRIVER_SHEEPDOG_SOURCES)
 libvirt_storage_backend_sheepdog_priv_la_CFLAGS = \
        -I$(srcdir)/conf \
        $(AM_CFLAGS) \
@@ -368,7 +373,8 @@ libvirt_storage_backend_sheepdog_la_LIBADD = \
 endif WITH_STORAGE_SHEEPDOG
 
 if WITH_STORAGE_GLUSTER
-libvirt_storage_backend_gluster_la_SOURCES = $(STORAGE_DRIVER_GLUSTER_SOURCES)
+libvirt_storage_backend_gluster_la_SOURCES = \
+       $(STORAGE_DRIVER_GLUSTER_SOURCES)
 libvirt_storage_backend_gluster_la_LIBADD = \
        libvirt.la \
        $(GLUSTERFS_LIBS) \
@@ -384,7 +390,8 @@ storagebackend_LTLIBRARIES += libvirt_storage_backend_gluster.la
 libvirt_storage_backend_gluster_la_LDFLAGS = $(AM_LDFLAGS_MOD)
 
 
-libvirt_storage_file_gluster_la_SOURCES = $(STORAGE_FILE_GLUSTER_SOURCES)
+libvirt_storage_file_gluster_la_SOURCES = \
+       $(STORAGE_FILE_GLUSTER_SOURCES)
 libvirt_storage_file_gluster_la_LIBADD = \
        libvirt.la \
        $(GLUSTERFS_LIBS) \
@@ -401,7 +408,8 @@ libvirt_storage_file_gluster_la_LDFLAGS = $(AM_LDFLAGS_MOD)
 endif WITH_STORAGE_GLUSTER
 
 if WITH_STORAGE_ZFS
-libvirt_storage_backend_zfs_la_SOURCES = $(STORAGE_DRIVER_ZFS_SOURCES)
+libvirt_storage_backend_zfs_la_SOURCES = \
+       $(STORAGE_DRIVER_ZFS_SOURCES)
 libvirt_storage_backend_zfs_la_CFLAGS = \
        -I$(srcdir)/conf \
        $(AM_CFLAGS) \
@@ -416,7 +424,8 @@ libvirt_storage_backend_zfs_la_LIBADD = \
 endif WITH_STORAGE_ZFS
 
 if WITH_STORAGE_VSTORAGE
-libvirt_storage_backend_vstorage_la_SOURCES = $(STORAGE_DRIVER_VSTORAGE_SOURCES)
+libvirt_storage_backend_vstorage_la_SOURCES = \
+       $(STORAGE_DRIVER_VSTORAGE_SOURCES)
 libvirt_storage_backend_vstorage_la_CFLAGS = \
        -I$(srcdir)/conf \
        $(AM_CFLAGS) \