mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-27 19:11:16 +00:00
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>
This commit is contained in:
parent
87ecf62d4c
commit
851dba3f47
2
cfg.mk
2
cfg.mk
@ -737,7 +737,7 @@ sc_prohibit_long_lines:
|
|||||||
halt='Wrap long lines in expected output files' \
|
halt='Wrap long lines in expected output files' \
|
||||||
$(_sc_search_regexp)
|
$(_sc_search_regexp)
|
||||||
@prohibit='.{80}' \
|
@prohibit='.{80}' \
|
||||||
in_vc_files='Makefile\.am' \
|
in_vc_files='Makefile(\.inc)?\.am' \
|
||||||
halt='Wrap long lines in Makefiles' \
|
halt='Wrap long lines in Makefiles' \
|
||||||
$(_sc_search_regexp)
|
$(_sc_search_regexp)
|
||||||
|
|
||||||
|
@ -75,10 +75,12 @@ VIRTINTERFACED_UNIT_VARS = \
|
|||||||
-e 's|[@]sockprefix[@]|virtinterfaced|g' \
|
-e 's|[@]sockprefix[@]|virtinterfaced|g' \
|
||||||
$(NULL)
|
$(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 $@
|
$(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 $@
|
$(AM_V_GEN)$(SED) $(VIRTINTERFACED_UNIT_VARS) $< > $@-t && mv $@-t $@
|
||||||
|
|
||||||
interface/virtinterfaced.conf: remote/libvirtd.conf.in
|
interface/virtinterfaced.conf: remote/libvirtd.conf.in
|
||||||
|
@ -80,9 +80,12 @@ SYSTEMD_UNIT_FILES_IN += \
|
|||||||
libxl/virtxend.service.in \
|
libxl/virtxend.service.in \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
LIBXL_UNIT_COND = ConditionPathExists=/proc/xen/capabilities
|
||||||
|
LIBXL_UNIT_CONFLICT = Conflicts=$(LIBVIRTD_SOCKET_UNIT_FILES)
|
||||||
|
|
||||||
VIRTXEND_UNIT_VARS = \
|
VIRTXEND_UNIT_VARS = \
|
||||||
$(COMMON_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|[@]name[@]|Libvirt libxl|g' \
|
||||||
-e 's|[@]service[@]|virtxend|g' \
|
-e 's|[@]service[@]|virtxend|g' \
|
||||||
-e 's|[@]sockprefix[@]|virtxend|g' \
|
-e 's|[@]sockprefix[@]|virtxend|g' \
|
||||||
|
@ -82,10 +82,12 @@ VIRTNETWORKD_UNIT_VARS = \
|
|||||||
-e 's|[@]sockprefix[@]|virtnetworkd|g' \
|
-e 's|[@]sockprefix[@]|virtnetworkd|g' \
|
||||||
$(NULL)
|
$(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 $@
|
$(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 $@
|
$(AM_V_GEN)$(SED) $(VIRTNETWORKD_UNIT_VARS) $< > $@-t && mv $@-t $@
|
||||||
|
|
||||||
network/virtnetworkd.conf: remote/libvirtd.conf.in
|
network/virtnetworkd.conf: remote/libvirtd.conf.in
|
||||||
|
@ -98,10 +98,12 @@ VIRTNODEDEVD_UNIT_VARS = \
|
|||||||
-e 's|[@]sockprefix[@]|virtnodedevd|g' \
|
-e 's|[@]sockprefix[@]|virtnodedevd|g' \
|
||||||
$(NULL)
|
$(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 $@
|
$(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 $@
|
$(AM_V_GEN)$(SED) $(VIRTNODEDEVD_UNIT_VARS) $< > $@-t && mv $@-t $@
|
||||||
|
|
||||||
node_device/virtnodedevd.conf: remote/libvirtd.conf.in
|
node_device/virtnodedevd.conf: remote/libvirtd.conf.in
|
||||||
|
@ -83,10 +83,12 @@ VIRTNWFILTERD_UNIT_VARS = \
|
|||||||
-e 's|[@]sockprefix[@]|virtnwfilterd|g' \
|
-e 's|[@]sockprefix[@]|virtnwfilterd|g' \
|
||||||
$(NULL)
|
$(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 $@
|
$(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 $@
|
$(AM_V_GEN)$(SED) $(VIRTNWFILTERD_UNIT_VARS) $< > $@-t && mv $@-t $@
|
||||||
|
|
||||||
nwfilter/virtnwfilterd.conf: remote/libvirtd.conf.in
|
nwfilter/virtnwfilterd.conf: remote/libvirtd.conf.in
|
||||||
|
@ -71,10 +71,12 @@ VIRTSECRETD_UNIT_VARS = \
|
|||||||
-e 's|[@]sockprefix[@]|virtsecretd|g' \
|
-e 's|[@]sockprefix[@]|virtsecretd|g' \
|
||||||
$(NULL)
|
$(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 $@
|
$(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 $@
|
$(AM_V_GEN)$(SED) $(VIRTSECRETD_UNIT_VARS) $< > $@-t && mv $@-t $@
|
||||||
|
|
||||||
secret/virtsecretd.conf: remote/libvirtd.conf.in
|
secret/virtsecretd.conf: remote/libvirtd.conf.in
|
||||||
|
@ -175,10 +175,12 @@ VIRTSTORAGED_UNIT_VARS = \
|
|||||||
-e 's|[@]sockprefix[@]|virtstoraged|g' \
|
-e 's|[@]sockprefix[@]|virtstoraged|g' \
|
||||||
$(NULL)
|
$(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 $@
|
$(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 $@
|
$(AM_V_GEN)$(SED) $(VIRTSTORAGED_UNIT_VARS) $< > $@-t && mv $@-t $@
|
||||||
|
|
||||||
storage/virtstoraged.conf: remote/libvirtd.conf.in
|
storage/virtstoraged.conf: remote/libvirtd.conf.in
|
||||||
@ -264,7 +266,8 @@ libvirt_storage_backend_iscsi_la_LIBADD = \
|
|||||||
endif WITH_STORAGE_ISCSI
|
endif WITH_STORAGE_ISCSI
|
||||||
|
|
||||||
if WITH_STORAGE_ISCSI_DIRECT
|
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 = \
|
libvirt_storage_backend_iscsi_direct_la_CFLAGS = \
|
||||||
-I$(srcdir)/conf \
|
-I$(srcdir)/conf \
|
||||||
-I$(srcdir)/secret \
|
-I$(srcdir)/secret \
|
||||||
@ -346,13 +349,15 @@ libvirt_storage_backend_rbd_la_LDFLAGS = $(AM_LDFLAGS_MOD)
|
|||||||
endif WITH_STORAGE_RBD
|
endif WITH_STORAGE_RBD
|
||||||
|
|
||||||
if WITH_STORAGE_SHEEPDOG
|
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 = \
|
libvirt_storage_backend_sheepdog_la_CFLAGS = \
|
||||||
-I$(srcdir)/conf \
|
-I$(srcdir)/conf \
|
||||||
$(AM_CFLAGS) \
|
$(AM_CFLAGS) \
|
||||||
$(NULL)
|
$(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 = \
|
libvirt_storage_backend_sheepdog_priv_la_CFLAGS = \
|
||||||
-I$(srcdir)/conf \
|
-I$(srcdir)/conf \
|
||||||
$(AM_CFLAGS) \
|
$(AM_CFLAGS) \
|
||||||
@ -368,7 +373,8 @@ libvirt_storage_backend_sheepdog_la_LIBADD = \
|
|||||||
endif WITH_STORAGE_SHEEPDOG
|
endif WITH_STORAGE_SHEEPDOG
|
||||||
|
|
||||||
if WITH_STORAGE_GLUSTER
|
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_storage_backend_gluster_la_LIBADD = \
|
||||||
libvirt.la \
|
libvirt.la \
|
||||||
$(GLUSTERFS_LIBS) \
|
$(GLUSTERFS_LIBS) \
|
||||||
@ -384,7 +390,8 @@ storagebackend_LTLIBRARIES += libvirt_storage_backend_gluster.la
|
|||||||
libvirt_storage_backend_gluster_la_LDFLAGS = $(AM_LDFLAGS_MOD)
|
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_storage_file_gluster_la_LIBADD = \
|
||||||
libvirt.la \
|
libvirt.la \
|
||||||
$(GLUSTERFS_LIBS) \
|
$(GLUSTERFS_LIBS) \
|
||||||
@ -401,7 +408,8 @@ libvirt_storage_file_gluster_la_LDFLAGS = $(AM_LDFLAGS_MOD)
|
|||||||
endif WITH_STORAGE_GLUSTER
|
endif WITH_STORAGE_GLUSTER
|
||||||
|
|
||||||
if WITH_STORAGE_ZFS
|
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 = \
|
libvirt_storage_backend_zfs_la_CFLAGS = \
|
||||||
-I$(srcdir)/conf \
|
-I$(srcdir)/conf \
|
||||||
$(AM_CFLAGS) \
|
$(AM_CFLAGS) \
|
||||||
@ -416,7 +424,8 @@ libvirt_storage_backend_zfs_la_LIBADD = \
|
|||||||
endif WITH_STORAGE_ZFS
|
endif WITH_STORAGE_ZFS
|
||||||
|
|
||||||
if WITH_STORAGE_VSTORAGE
|
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 = \
|
libvirt_storage_backend_vstorage_la_CFLAGS = \
|
||||||
-I$(srcdir)/conf \
|
-I$(srcdir)/conf \
|
||||||
$(AM_CFLAGS) \
|
$(AM_CFLAGS) \
|
||||||
|
Loading…
Reference in New Issue
Block a user