[Spice-commits] 2 commits - common/Makefile.am tests/Makefile.am

[GitLab Mirror]

 common/Makefile.am |    6 +++---
 tests/Makefile.am  |   16 +++++++---------
 2 files changed, 10 insertions(+), 12 deletions(-)

New commits:
commit 0385a67ef85ad985f186f2050f5ddc0c58fbea10
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Jun 28 08:13:40 2018 +0100

    build: Reindent macros
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/common/Makefile.am b/common/Makefile.am
index 3cbc49f..5ca6538 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -88,10 +88,10 @@ libspice_common_la_LIBADD =				\
 	$(SPICE_COMMON_LIBS)				\
 	$(NULL)
 
-MARSHALLERS_DEPS =							\
-	$(top_srcdir)/python_modules/__init__.py		\
+MARSHALLERS_DEPS =					\
+	$(top_srcdir)/python_modules/__init__.py	\
 	$(top_srcdir)/python_modules/codegen.py		\
-	$(top_srcdir)/python_modules/demarshal.py		\
+	$(top_srcdir)/python_modules/demarshal.py	\
 	$(top_srcdir)/python_modules/marshal.py		\
 	$(top_srcdir)/python_modules/ptypes.py		\
 	$(top_srcdir)/python_modules/spice_parser.py	\
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 39d30c0..1021954 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,8 +12,8 @@ test_logging_CFLAGS =			\
 	$(NULL)
 test_logging_LDADD =					\
 	$(top_builddir)/common/libspice-common.la	\
-	$(GLIB2_LIBS)			\
-	$(GIO_UNIX_LIBS)		\
+	$(GLIB2_LIBS)					\
+	$(GIO_UNIX_LIBS)				\
 	$(NULL)
 
 
@@ -29,7 +29,7 @@ test_marshallers_CFLAGS =		\
 	$(NULL)
 test_marshallers_LDADD =				\
 	$(top_builddir)/common/libspice-common.la	\
-	$(GLIB2_LIBS)			\
+	$(GLIB2_LIBS)					\
 	$(NULL)
 
 
@@ -74,10 +74,10 @@ TEST_MARSHALLERS =				\
 
 BUILT_SOURCES = $(TEST_MARSHALLERS)
 
-MARSHALLERS_DEPS =							\
-	$(top_srcdir)/python_modules/__init__.py		\
+MARSHALLERS_DEPS =					\
+	$(top_srcdir)/python_modules/__init__.py	\
 	$(top_srcdir)/python_modules/codegen.py		\
-	$(top_srcdir)/python_modules/demarshal.py		\
+	$(top_srcdir)/python_modules/demarshal.py	\
 	$(top_srcdir)/python_modules/marshal.py		\
 	$(top_srcdir)/python_modules/ptypes.py		\
 	$(top_srcdir)/python_modules/spice_parser.py	\
commit da4926bd26b3f7c96da30b48f480d1d53adac3b4
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Jun 28 08:13:03 2018 +0100

    build: Reuse TEST_MARSHALLERS macro
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 457bb23..39d30c0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,9 +18,7 @@ test_logging_LDADD =					\
 
 
 test_marshallers_SOURCES =		\
-	generated_test_marshallers.c	\
-	generated_test_marshallers.h	\
-	generated_test_demarshallers.c	\
+	$(TEST_MARSHALLERS)		\
 	test-marshallers.c		\
 	test-marshallers.h		\
 	$(NULL)