[libvirt] [PATCH] maint: Add filetype annotations to Makefile.inc.am

Andrea Bolognani posted 1 patch 9 weeks ago
Test syntax-check passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20190412124404.13647-1-abologna@redhat.com
src/access/Makefile.inc.am      | 3 +++
src/admin/Makefile.inc.am       | 3 +++
src/bhyve/Makefile.inc.am       | 3 +++
src/conf/Makefile.inc.am        | 3 +++
src/cpu/Makefile.inc.am         | 3 +++
src/cpu_map/Makefile.inc.am     | 3 +++
src/esx/Makefile.inc.am         | 3 +++
src/hyperv/Makefile.inc.am      | 3 +++
src/interface/Makefile.inc.am   | 3 +++
src/libxl/Makefile.inc.am       | 3 +++
src/locking/Makefile.inc.am     | 3 +++
src/logging/Makefile.inc.am     | 3 +++
src/lxc/Makefile.inc.am         | 3 +++
src/network/Makefile.inc.am     | 3 +++
src/node_device/Makefile.inc.am | 3 +++
src/nwfilter/Makefile.inc.am    | 3 +++
src/openvz/Makefile.inc.am      | 3 +++
src/phyp/Makefile.inc.am        | 3 +++
src/qemu/Makefile.inc.am        | 3 +++
src/remote/Makefile.inc.am      | 3 +++
src/rpc/Makefile.inc.am         | 3 +++
src/secret/Makefile.inc.am      | 3 +++
src/security/Makefile.inc.am    | 3 +++
src/storage/Makefile.inc.am     | 3 +++
src/test/Makefile.inc.am        | 3 +++
src/util/Makefile.inc.am        | 3 +++
src/vbox/Makefile.inc.am        | 3 +++
src/vmware/Makefile.inc.am      | 3 +++
src/vmx/Makefile.inc.am         | 3 +++
src/vz/Makefile.inc.am          | 3 +++
src/xenapi/Makefile.inc.am      | 3 +++
src/xenconfig/Makefile.inc.am   | 3 +++
32 files changed, 96 insertions(+)

[libvirt] [PATCH] maint: Add filetype annotations to Makefile.inc.am

Posted by Andrea Bolognani 9 weeks ago
Both vim and emacs have trouble figuring out the filetype
automatically because the name doesn't follow existing
conventions; annotations like the ones we already have in
Makefile.ci help them out.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 src/access/Makefile.inc.am      | 3 +++
 src/admin/Makefile.inc.am       | 3 +++
 src/bhyve/Makefile.inc.am       | 3 +++
 src/conf/Makefile.inc.am        | 3 +++
 src/cpu/Makefile.inc.am         | 3 +++
 src/cpu_map/Makefile.inc.am     | 3 +++
 src/esx/Makefile.inc.am         | 3 +++
 src/hyperv/Makefile.inc.am      | 3 +++
 src/interface/Makefile.inc.am   | 3 +++
 src/libxl/Makefile.inc.am       | 3 +++
 src/locking/Makefile.inc.am     | 3 +++
 src/logging/Makefile.inc.am     | 3 +++
 src/lxc/Makefile.inc.am         | 3 +++
 src/network/Makefile.inc.am     | 3 +++
 src/node_device/Makefile.inc.am | 3 +++
 src/nwfilter/Makefile.inc.am    | 3 +++
 src/openvz/Makefile.inc.am      | 3 +++
 src/phyp/Makefile.inc.am        | 3 +++
 src/qemu/Makefile.inc.am        | 3 +++
 src/remote/Makefile.inc.am      | 3 +++
 src/rpc/Makefile.inc.am         | 3 +++
 src/secret/Makefile.inc.am      | 3 +++
 src/security/Makefile.inc.am    | 3 +++
 src/storage/Makefile.inc.am     | 3 +++
 src/test/Makefile.inc.am        | 3 +++
 src/util/Makefile.inc.am        | 3 +++
 src/vbox/Makefile.inc.am        | 3 +++
 src/vmware/Makefile.inc.am      | 3 +++
 src/vmx/Makefile.inc.am         | 3 +++
 src/vz/Makefile.inc.am          | 3 +++
 src/xenapi/Makefile.inc.am      | 3 +++
 src/xenconfig/Makefile.inc.am   | 3 +++
 32 files changed, 96 insertions(+)

diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am
index 6d57ca1a1b..5233a6fc08 100644
--- a/src/access/Makefile.inc.am
+++ b/src/access/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 ACCESS_DRIVER_GENERATED = \
 	access/viraccessapicheck.h \
 	access/viraccessapicheck.c \
diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am
index 19afb0e179..d3300d57ff 100644
--- a/src/admin/Makefile.inc.am
+++ b/src/admin/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 ADMIN_PROTOCOL = $(srcdir)/admin/admin_protocol.x
 
 ADMIN_PROTOCOL_GENERATED = \
diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am
index fba1b9ef30..ebd576f334 100644
--- a/src/bhyve/Makefile.inc.am
+++ b/src/bhyve/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 BHYVE_DRIVER_SOURCES = \
 	bhyve/bhyve_capabilities.c \
 	bhyve/bhyve_capabilities.h \
diff --git a/src/conf/Makefile.inc.am b/src/conf/Makefile.inc.am
index 6eb64db9de..2040220378 100644
--- a/src/conf/Makefile.inc.am
+++ b/src/conf/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 NETDEV_CONF_SOURCES = \
 	conf/netdev_bandwidth_conf.h \
 	conf/netdev_bandwidth_conf.c \
diff --git a/src/cpu/Makefile.inc.am b/src/cpu/Makefile.inc.am
index 5020d40583..3508158fab 100644
--- a/src/cpu/Makefile.inc.am
+++ b/src/cpu/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 CPU_SOURCES = \
 	cpu/cpu.h \
 	cpu/cpu.c \
diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am
index 9d7cef15c5..39d98f8ce7 100644
--- a/src/cpu_map/Makefile.inc.am
+++ b/src/cpu_map/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 cpumapdir = $(pkgdatadir)/cpu_map
 cpumap_DATA = \
 	cpu_map/index.xml \
diff --git a/src/esx/Makefile.inc.am b/src/esx/Makefile.inc.am
index 152dd7b979..95846baea5 100644
--- a/src/esx/Makefile.inc.am
+++ b/src/esx/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 ESX_DRIVER_SOURCES = \
 	esx/esx_private.h \
 	esx/esx_driver.c \
diff --git a/src/hyperv/Makefile.inc.am b/src/hyperv/Makefile.inc.am
index a768272b72..e5cc06bab7 100644
--- a/src/hyperv/Makefile.inc.am
+++ b/src/hyperv/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 HYPERV_DRIVER_SOURCES = \
 	hyperv/hyperv_private.h \
 	hyperv/hyperv_driver.c \
diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am
index 08b35d040d..d1c59fa75b 100644
--- a/src/interface/Makefile.inc.am
+++ b/src/interface/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 INTERFACE_DRIVER_SOURCES = \
 	interface/interface_driver.h \
 	interface/interface_driver.c \
diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index 59c136bf4e..86dfb176ca 100644
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 LIBXL_DRIVER_SOURCES = \
 	libxl/libxl_conf.c \
 	libxl/libxl_conf.h \
diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index 5d5e923769..1d75223106 100644
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 DRIVER_SOURCES += \
 	locking/lock_manager.c \
 	locking/lock_manager.h \
diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
index 3f4a87d91a..05ec5aa197 100644
--- a/src/logging/Makefile.inc.am
+++ b/src/logging/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 LOG_PROTOCOL_GENERATED = \
 	logging/log_protocol.h \
 	logging/log_protocol.c \
diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index 8dd2e9ea9e..a5b00a830d 100644
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 LXC_MONITOR_PROTOCOL_GENERATED = \
 	lxc/lxc_monitor_protocol.h \
 	lxc/lxc_monitor_protocol.c \
diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
index cbaaa7ea68..ae546be0c2 100644
--- a/src/network/Makefile.inc.am
+++ b/src/network/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 NETWORK_DRIVER_SOURCES = \
 	network/bridge_driver.h \
 	network/bridge_driver.c \
diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am
index 0c3ad51273..c2255bd845 100644
--- a/src/node_device/Makefile.inc.am
+++ b/src/node_device/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 NODE_DEVICE_DRIVER_SOURCES = \
 	node_device/node_device_driver.c \
 	node_device/node_device_driver.h \
diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am
index 27aa801095..aabfccd654 100644
--- a/src/nwfilter/Makefile.inc.am
+++ b/src/nwfilter/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 NWFILTER_DRIVER_SOURCES = \
 	nwfilter/nwfilter_driver.h \
 	nwfilter/nwfilter_driver.c \
diff --git a/src/openvz/Makefile.inc.am b/src/openvz/Makefile.inc.am
index baad737362..f88660ee7b 100644
--- a/src/openvz/Makefile.inc.am
+++ b/src/openvz/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 OPENVZ_DRIVER_SOURCES = \
 	openvz/openvz_conf.c \
 	openvz/openvz_conf.h \
diff --git a/src/phyp/Makefile.inc.am b/src/phyp/Makefile.inc.am
index 496ff25266..2e213413a3 100644
--- a/src/phyp/Makefile.inc.am
+++ b/src/phyp/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 PHYP_DRIVER_SOURCES = \
 	phyp/phyp_driver.c \
 	phyp/phyp_driver.h \
diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index 8d10e1085a..59b970c077 100644
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 QEMU_DRIVER_SOURCES = \
 	qemu/qemu_agent.c \
 	qemu/qemu_agent.h \
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 13a1f9f8f2..26e2091434 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 REMOTE_DRIVER_GENERATED = \
 	remote/remote_protocol.c \
 	remote/remote_protocol.h \
diff --git a/src/rpc/Makefile.inc.am b/src/rpc/Makefile.inc.am
index 722ef64db1..50bdde5d9f 100644
--- a/src/rpc/Makefile.inc.am
+++ b/src/rpc/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 EXTRA_DIST += \
 	rpc/gendispatch.pl \
 	rpc/genprotocol.pl \
diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am
index 79c2b2d74a..fa377578ea 100644
--- a/src/secret/Makefile.inc.am
+++ b/src/secret/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 SECRET_DRIVER_SOURCES = \
 	secret/secret_driver.h \
 	secret/secret_driver.c \
diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am
index b24cdfd083..6d1f749b49 100644
--- a/src/security/Makefile.inc.am
+++ b/src/security/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \
 	$(DATATYPES_SOURCES) \
 	security/virt-aa-helper.c \
diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index b4400b556f..a68e58f065 100644
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 STORAGE_DRIVER_BACKEND_SOURCES = \
 	storage/storage_backend.h \
 	storage/storage_backend.c \
diff --git a/src/test/Makefile.inc.am b/src/test/Makefile.inc.am
index d52c281545..8d2201f352 100644
--- a/src/test/Makefile.inc.am
+++ b/src/test/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 TEST_DRIVER_SOURCES = \
 	test/test_driver.c \
 	test/test_driver.h \
diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am
index 58874cca3c..ccdca2263f 100644
--- a/src/util/Makefile.inc.am
+++ b/src/util/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 # These files are not related to driver APIs. Simply generic
 # helper APIs for various purposes
 UTIL_SOURCES = \
diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am
index 8c76f84e82..2cabe96c1c 100644
--- a/src/vbox/Makefile.inc.am
+++ b/src/vbox/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 VBOX_DRIVER_SOURCES = \
 	vbox/vbox_glue.c \
 	vbox/vbox_glue.h \
diff --git a/src/vmware/Makefile.inc.am b/src/vmware/Makefile.inc.am
index 0fbf866030..6a1b565070 100644
--- a/src/vmware/Makefile.inc.am
+++ b/src/vmware/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 VMWARE_DRIVER_SOURCES = \
 	vmware/vmware_driver.c \
 	vmware/vmware_driver.h \
diff --git a/src/vmx/Makefile.inc.am b/src/vmx/Makefile.inc.am
index b9bf6ef690..b15fe37e62 100644
--- a/src/vmx/Makefile.inc.am
+++ b/src/vmx/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 VMX_SOURCES = \
 	vmx/vmx.c \
 	vmx/vmx.h \
diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am
index cacdb38795..8e53906cae 100644
--- a/src/vz/Makefile.inc.am
+++ b/src/vz/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 VZ_DRIVER_SOURCES = \
 	vz/vz_driver.h \
 	vz/vz_driver.c \
diff --git a/src/xenapi/Makefile.inc.am b/src/xenapi/Makefile.inc.am
index 4640e9943f..2eee125ae2 100644
--- a/src/xenapi/Makefile.inc.am
+++ b/src/xenapi/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 XENAPI_DRIVER_SOURCES = \
 	xenapi/xenapi_driver.c \
 	xenapi/xenapi_driver.h \
diff --git a/src/xenconfig/Makefile.inc.am b/src/xenconfig/Makefile.inc.am
index a87d69990f..861e1c69ce 100644
--- a/src/xenconfig/Makefile.inc.am
+++ b/src/xenconfig/Makefile.inc.am
@@ -1,3 +1,6 @@
+# -*- makefile -*-
+# vim: filetype=make
+
 XENCONFIG_SOURCES = \
 	xenconfig/xenxs_private.h \
 	xenconfig/xen_common.c \
-- 
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] maint: Add filetype annotations to Makefile.inc.am

Posted by Daniel P. Berrangé 9 weeks ago
On Fri, Apr 12, 2019 at 02:44:04PM +0200, Andrea Bolognani wrote:
> Both vim and emacs have trouble figuring out the filetype
> automatically because the name doesn't follow existing
> conventions; annotations like the ones we already have in
> Makefile.ci help them out.

I don't see any problems with emacs myself. It automatically
detects Makefile.in.am as being an automake file and activates
makefile-automake-mode without needing any special config.


> diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am
> index 6d57ca1a1b..5233a6fc08 100644
> --- a/src/access/Makefile.inc.am
> +++ b/src/access/Makefile.inc.am
> @@ -1,3 +1,6 @@
> +# -*- makefile -*-

That's plain makefile mode, which is different from makefile-automake mode
that is the one we need for these files.  I think we can just drop this
though since AFAICT it autodetects fine.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] maint: Add filetype annotations to Makefile.inc.am

Posted by Andrea Bolognani 9 weeks ago
On Fri, 2019-04-12 at 14:49 +0100, Daniel P. Berrangé wrote:
> On Fri, Apr 12, 2019 at 02:44:04PM +0200, Andrea Bolognani wrote:
> > Both vim and emacs have trouble figuring out the filetype
> > automatically because the name doesn't follow existing
> > conventions; annotations like the ones we already have in
> > Makefile.ci help them out.
> 
> I don't see any problems with emacs myself. It automatically
> detects Makefile.in.am as being an automake file and activates
> makefile-automake-mode without needing any special config.

Right, I assumed it would not be able to do that since it apparently
needed the annotation for Makefile.ci.

> > +++ b/src/access/Makefile.inc.am
> > @@ -1,3 +1,6 @@
> > +# -*- makefile -*-
> 
> That's plain makefile mode, which is different from makefile-automake mode
> that is the one we need for these files.

Turns out vim has a separate filetype (automake) for this as well!
We ought to be use that one, of course.

> I think we can just drop this
> though since AFAICT it autodetects fine.

Personally I'd leave both in, but I'm not an emacs user so if you
prefer I include the vim hints only that's totally fine with me.

-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] maint: Add filetype annotations to Makefile.inc.am

Posted by Daniel P. Berrangé 9 weeks ago
On Fri, Apr 12, 2019 at 04:05:27PM +0200, Andrea Bolognani wrote:
> On Fri, 2019-04-12 at 14:49 +0100, Daniel P. Berrangé wrote:
> > On Fri, Apr 12, 2019 at 02:44:04PM +0200, Andrea Bolognani wrote:
> > > Both vim and emacs have trouble figuring out the filetype
> > > automatically because the name doesn't follow existing
> > > conventions; annotations like the ones we already have in
> > > Makefile.ci help them out.
> > 
> > I don't see any problems with emacs myself. It automatically
> > detects Makefile.in.am as being an automake file and activates
> > makefile-automake-mode without needing any special config.
> 
> Right, I assumed it would not be able to do that since it apparently
> needed the annotation for Makefile.ci.
> 
> > > +++ b/src/access/Makefile.inc.am
> > > @@ -1,3 +1,6 @@
> > > +# -*- makefile -*-
> > 
> > That's plain makefile mode, which is different from makefile-automake mode
> > that is the one we need for these files.
> 
> Turns out vim has a separate filetype (automake) for this as well!
> We ought to be use that one, of course.
> 
> > I think we can just drop this
> > though since AFAICT it autodetects fine.
> 
> Personally I'd leave both in, but I'm not an emacs user so if you
> prefer I include the vim hints only that's totally fine with me.

We previously purged emacs magic comments from all files, in favour of
the top level .dir-locals.el file. So it is best not to reintroduce
them for files which already get detected correctly.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list