[Spice-devel] [PATCH spice-server] build: Fix some indentation issue on Makefile.am

Christophe Fergeau cfergeau at redhat.com
Thu Mar 16 16:08:27 UTC 2017


On Thu, Mar 16, 2017 at 10:26:24AM -0500, Jonathon Jongsma wrote:
> ACK for consistency (although I agree with you: I don't like this style
> of lining up the slashes. I'd rather just place them directly after the
> filename).

Oh, just kill these then if I'm the only one liking them :)

Christophe

> 
> Jonathon
> 
> On Tue, 2017-03-14 at 09:25 +0000, Frediano Ziglio wrote:
> > Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> > ---
> >  server/Makefile.am | 52 ++++++++++++++++++++++++++----------------
> > ----------
> >  1 file changed, 26 insertions(+), 26 deletions(-)
> > 
> > I still think this format is leading to misindentation but at least
> > this
> > fix some ugly ones.
> > 
> > diff --git a/server/Makefile.am b/server/Makefile.am
> > index 49c0822..840f63e 100644
> > --- a/server/Makefile.am
> > +++ b/server/Makefile.am
> > @@ -83,13 +83,13 @@ libserver_la_SOURCES =				
> > \
> >  	event-loop.c				\
> >  	glz-encoder.c				\
> >  	glz-encoder.h				\
> > -	glz-encoder-dict.c		\
> > -	glz-encoder-dict.h		\
> > -	glz-encoder-priv.h	\
> > +	glz-encoder-dict.c			\
> > +	glz-encoder-dict.h			\
> > +	glz-encoder-priv.h			\
> >  	inputs-channel.c			\
> >  	inputs-channel.h			\
> > -	inputs-channel-client.c		\
> > -	inputs-channel-client.h		\
> > +	inputs-channel-client.c			\
> > +	inputs-channel-client.h			\
> >  	jpeg-encoder.c				\
> >  	jpeg-encoder.h				\
> >  	main-channel.c				\
> > @@ -112,7 +112,7 @@ libserver_la_SOURCES =				
> > \
> >  	red-qxl.h				\
> >  	main-dispatcher.c			\
> >  	main-dispatcher.h			\
> > -	migration-protocol.h		\
> > +	migration-protocol.h			\
> >  	memslot.c				\
> >  	memslot.h				\
> >  	red-parse-qxl.c				\
> > @@ -136,9 +136,9 @@ libserver_la_SOURCES =				
> > \
> >  	reds-private.h				\
> >  	reds-stream.c				\
> >  	reds-stream.h				\
> > -	sw-canvas.c			\
> > -	sound.c				\
> > -	sound.h				\
> > +	sw-canvas.c				\
> > +	sound.c					\
> > +	sound.h					\
> >  	stat.h					\
> >  	stat-file.c				\
> >  	stat-file.h				\
> > @@ -146,48 +146,48 @@ libserver_la_SOURCES =				
> > \
> >  	video-encoder.h				\
> >  	zlib-encoder.c				\
> >  	zlib-encoder.h				\
> > -	image-cache.h			\
> > -	image-cache.c			\
> > +	image-cache.h				\
> > +	image-cache.c				\
> >  	pixmap-cache.h				\
> >  	pixmap-cache.c				\
> > -	tree.h				\
> > -	tree.c				\
> > +	tree.h					\
> > +	tree.c					\
> >  	spice-bitmap-utils.h			\
> >  	spice-bitmap-utils.c			\
> >  	utils.c					\
> >  	utils.h					\
> > -	stream.c					\
> > -	stream.h					\
> > +	stream.c				\
> > +	stream.h				\
> >  	dcc.c					\
> > -	dcc-send.c					\
> > +	dcc-send.c				\
> >  	dcc.h					\
> >  	display-limits.h			\
> >  	dcc-private.h				\
> > -	image-encoders.c					\
> > -	image-encoders.h					\
> > +	image-encoders.c			\
> > +	image-encoders.h			\
> >  	glib-compat.h				\
> > -	$(spice_built_sources)		\
> > +	$(spice_built_sources)			\
> >  	$(NULL)
> >  
> >  if HAVE_LZ4
> > -libserver_la_SOURCES +=	\
> > +libserver_la_SOURCES +=				\
> >  	lz4-encoder.c				\
> >  	lz4-encoder.h				\
> >  	$(NULL)
> >  endif
> >  
> >  if HAVE_SMARTCARD
> > -libserver_la_SOURCES +=	\
> > -	smartcard.c		\
> > -	smartcard.h		\
> > +libserver_la_SOURCES +=			\
> > +	smartcard.c			\
> > +	smartcard.h			\
> >  	smartcard-channel-client.c	\
> >  	smartcard-channel-client.h	\
> >  	$(NULL)
> >  endif
> >  
> >  if HAVE_GSTREAMER
> > -libserver_la_SOURCES +=	\
> > -	gstreamer-encoder.c			\
> > +libserver_la_SOURCES +=			\
> > +	gstreamer-encoder.c		\
> >  	$(NULL)
> >  endif
> >  
> > @@ -201,7 +201,7 @@ spice-server-enums.h: spice-server.h spice-
> > server-enums.tmpl.h
> >  	$(AM_V_GEN)glib-mkenums --template $(srcdir)/spice-server-
> > enums.tmpl.h $< > $@
> >  
> >  EXTRA_DIST =					\
> > -	spice-bitmap-utils.tmpl.c			\
> > +	spice-bitmap-utils.tmpl.c		\
> >  	cache-item.tmpl.c			\
> >  	glz-encode-match.tmpl.c			\
> >  	glz-encode.tmpl.c			\
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20170316/0e6241dc/attachment.sig>


More information about the Spice-devel mailing list