[Spice-devel] [vdagent-linux v1 1/3] build-sys: reformat Makefile.am

[Frediano Ziglio]

> 
> Makes the makefile more readable and easy to change in the next few
> commits.
> 
> Based on Marc-André Lureau patch.
> ---
>  Makefile.am | 94
>  +++++++++++++++++++++++++++++++++++++++++--------------------
>  1 file changed, 63 insertions(+), 31 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 680ef83..4739c44 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -4,24 +4,52 @@ NULL =
>  bin_PROGRAMS = src/spice-vdagent
>  sbin_PROGRAMS = src/spice-vdagentd
>  
> -src_spice_vdagent_CFLAGS = $(X_CFLAGS) $(SPICE_CFLAGS) $(GLIB2_CFLAGS)
> $(ALSA_CFLAGS) -DUDSCS_NO_SERVER
> -src_spice_vdagent_LDADD = $(X_LIBS) $(SPICE_LIBS) $(GLIB2_LIBS) $(ALSA_LIBS)
> -src_spice_vdagent_SOURCES = src/vdagent.c \
> -                            src/vdagent-x11.c \
> -                            src/vdagent-x11-randr.c \
> -                            src/vdagent-file-xfers.c \
> -                            src/vdagent-audio.c \
> -                            src/udscs.c
> -
> -src_spice_vdagentd_CFLAGS = $(DBUS_CFLAGS) $(LIBSYSTEMD_LOGIN_CFLAGS) \
> -  $(PCIACCESS_CFLAGS) $(SPICE_CFLAGS) $(GLIB2_CFLAGS) $(PIE_CFLAGS)
> -src_spice_vdagentd_LDADD = $(DBUS_LIBS) $(LIBSYSTEMD_LOGIN_LIBS) \
> -  $(PCIACCESS_LIBS) $(SPICE_LIBS) $(GLIB2_LIBS) $(PIE_LDFLAGS)
> -src_spice_vdagentd_SOURCES = src/vdagentd.c \
> -                             src/vdagentd-uinput.c \
> -                             src/vdagentd-xorg-conf.c \
> -                             src/vdagent-virtio-port.c \
> -                             src/udscs.c
> +src_spice_vdagent_CFLAGS =			\
> +	$(X_CFLAGS)				\
> +	$(SPICE_CFLAGS)				\
> +	$(GLIB2_CFLAGS)				\
> +	$(ALSA_CFLAGS)				\
> +	-DUDSCS_NO_SERVER
> +

Why not always use the final $(NULL) line terminator?
This would reduce line changes in the near (later patches in
this patchset) future.

> +src_spice_vdagent_LDADD =			\
> +	$(X_LIBS)				\
> +	$(SPICE_LIBS)				\
> +	$(GLIB2_LIBS)				\
> +	$(ALSA_LIBS)
> +
> +src_spice_vdagent_SOURCES =			\
> +	src/udscs.c				\
> +	src/vdagent-audio.c			\
> +	src/vdagent-file-xfers.c		\
> +	src/vdagent-x11-randr.c			\
> +	src/vdagent-x11.c			\
> +	src/vdagent.c				\
> +	$(NULL)
> +
> +src_spice_vdagentd_CFLAGS =			\
> +	$(DBUS_CFLAGS)				\
> +	$(LIBSYSTEMD_LOGIN_CFLAGS)		\
> +	$(PCIACCESS_CFLAGS)			\
> +	$(SPICE_CFLAGS)				\
> +	$(GLIB2_CFLAGS)				\
> +	$(PIE_CFLAGS)
> +
> +src_spice_vdagentd_LDADD =			\
> +	$(DBUS_LIBS)				\
> +	$(LIBSYSTEMD_LOGIN_LIBS)		\
> +	$(PCIACCESS_LIBS)			\
> +	$(SPICE_LIBS)				\
> +	$(GLIB2_LIBS)				\
> +	$(PIE_LDFLAGS)
> +
> +src_spice_vdagentd_SOURCES =			\
> +	src/vdagentd.c				\
> +	src/vdagentd-uinput.c			\
> +	src/vdagentd-xorg-conf.c		\
> +	src/vdagent-virtio-port.c		\
> +	src/udscs.c				\
> +	$(NULL)
> +
>  if HAVE_CONSOLE_KIT
>  src_spice_vdagentd_SOURCES += src/console-kit.c
>  else
> @@ -32,17 +60,19 @@ src_spice_vdagentd_SOURCES += src/dummy-session-info.c
>  endif
>  endif
>  
> -noinst_HEADERS = src/session-info.h \
> -                 src/udscs.h \
> -                 src/vdagent-audio.h \
> -                 src/vdagent-file-xfers.h \
> -                 src/vdagent-virtio-port.h \
> -                 src/vdagent-x11.h \
> -                 src/vdagent-x11-priv.h \
> -                 src/vdagentd-proto.h \
> -                 src/vdagentd-proto-strings.h \
> -                 src/vdagentd-uinput.h \
> -                 src/vdagentd-xorg-conf.h
> +noinst_HEADERS =				\
> +	src/session-info.h			\
> +	src/udscs.h				\
> +	src/vdagent-audio.h			\
> +	src/vdagent-file-xfers.h		\
> +	src/vdagent-virtio-port.h		\
> +	src/vdagent-x11-priv.h			\
> +	src/vdagent-x11.h			\
> +	src/vdagentd-proto-strings.h		\
> +	src/vdagentd-proto.h			\
> +	src/vdagentd-uinput.h			\
> +	src/vdagentd-xorg-conf.h		\
> +	$(NULL)
>  
>  xdgautostartdir = $(sysconfdir)/xdg/autostart
>  xdgautostart_DATA = $(top_srcdir)/data/spice-vdagent.desktop
> @@ -75,8 +105,10 @@ tmpfiles_DATA =
> $(top_srcdir)/data/tmpfiles.d/spice-vdagentd.conf
>  endif
>  
>  manpagedir = $(mandir)/man1
> -manpage_DATA = data/spice-vdagent.1	\
> -               data/spice-vdagentd.1
> +manpage_DATA =					\
> +	data/spice-vdagent.1			\
> +	data/spice-vdagentd.1			\
> +	$(NULL)
>  
>  EXTRA_DIST =					\
>  	NEWS					\

Not mandatory... acked anyway

Frediano