From a5328130d1708bec9aa13408e5da2292d9d4e444 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 18 Jul 2013 09:37:52 -0600 Subject: maint: split long lines in Makefiles Makefiles are another easy file to enforce line limits. Mostly straightforward; interesting tricks worth noting: src/Makefile.am: $(confdir) was already defined, use it in more places tests/Makefile.am: path_add and VG required some interesting compression * cfg.mk (sc_prohibit_long_lines): Add another test. * Makefile.am: Fix offenders. * daemon/Makefile.am: Likewise. * docs/Makefile.am: Likewise. * python/Makefile.am: Likewise. * src/Makefile.am: Likewise. * tests/Makefile.am: Likewise. Signed-off-by: Eric Blake --- Makefile.am | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index b3e858f..9e957d1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -78,7 +78,8 @@ nodist_libvirtmod_la_SOURCES = libvirt.c libvirt.h # need extra flags here libvirtmod_la_CFLAGS = $(WARN_CFLAGS) $(WARN_PYTHON_CFLAGS) -libvirtmod_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/src/.libs \ +libvirtmod_la_LDFLAGS = -module -avoid-version -shared \ + -L$(top_builddir)/src/.libs \ $(CYGWIN_EXTRA_LDFLAGS) libvirtmod_la_LIBADD = $(mylibs) \ $(CYGWIN_EXTRA_LIBADD) $(CYGWIN_EXTRA_PYTHON_LIBADD) @@ -89,7 +90,8 @@ nodist_libvirtmod_qemu_la_SOURCES = libvirt-qemu.c libvirt-qemu.h # need extra flags here libvirtmod_qemu_la_CFLAGS = $(WARN_PYTHON_CFLAGS) -libvirtmod_qemu_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/src/.libs \ +libvirtmod_qemu_la_LDFLAGS = -module -avoid-version -shared \ + -L$(top_builddir)/src/.libs \ $(CYGWIN_EXTRA_LDFLAGS) libvirtmod_qemu_la_LIBADD = $(myqemulibs) \ $(CYGWIN_EXTRA_LIBADD) $(CYGWIN_EXTRA_PYTHON_LIBADD) @@ -100,25 +102,29 @@ nodist_libvirtmod_lxc_la_SOURCES = libvirt-lxc.c libvirt-lxc.h # need extra flags here libvirtmod_lxc_la_CFLAGS = $(WARN_PYTHON_CFLAGS) -libvirtmod_lxc_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/src/.libs \ +libvirtmod_lxc_la_LDFLAGS = -module -avoid-version -shared \ + -L$(top_builddir)/src/.libs \ $(CYGWIN_EXTRA_LDFLAGS) libvirtmod_lxc_la_LIBADD = $(mylxclibs) \ $(CYGWIN_EXTRA_LIBADD) $(CYGWIN_EXTRA_PYTHON_LIBADD) GENERATE = generator.py -API_DESC = $(top_srcdir)/docs/libvirt-api.xml $(srcdir)/libvirt-override-api.xml +API_DESC = $(top_srcdir)/docs/libvirt-api.xml \ + $(srcdir)/libvirt-override-api.xml GENERATED= libvirt-export.c \ libvirt.c \ libvirt.h \ libvirt.py -QEMU_API_DESC = $(top_srcdir)/docs/libvirt-qemu-api.xml $(srcdir)/libvirt-qemu-override-api.xml +QEMU_API_DESC = $(top_srcdir)/docs/libvirt-qemu-api.xml \ + $(srcdir)/libvirt-qemu-override-api.xml QEMU_GENERATED= libvirt-qemu-export.c \ libvirt-qemu.c \ libvirt-qemu.h \ libvirt_qemu.py -LXC_API_DESC = $(top_srcdir)/docs/libvirt-lxc-api.xml $(srcdir)/libvirt-lxc-override-api.xml +LXC_API_DESC = $(top_srcdir)/docs/libvirt-lxc-api.xml \ + $(srcdir)/libvirt-lxc-override-api.xml LXC_GENERATED= libvirt-lxc-export.c \ libvirt-lxc.c \ libvirt-lxc.h \ -- cgit