From e10fba892b1330c5f451134efa25b6b27bdf45ff Mon Sep 17 00:00:00 2001
From: Stepan Blyshchak <38952541+stepanblyschak@users.noreply.github.com>
Date: Tue, 4 Jun 2019 16:41:42 +0300
Subject: [PATCH] [debian] increment debian compatibility to 10 to enable
 parallel package build (#461)

* fix parallel build

Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>

* [debian] increment debian compatibility to 10 to enable parallel package
build

From debhelper man pages:

"If neither option is specified, debhelper currently defaults to
--parallel in compat 10 (or later) and --no-parallel otherwise."

Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>

* make tests run serial

Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
---
 configure.ac          |  2 +-
 debian/compat         |  2 +-
 meta/Makefile.am      | 18 +++++++++++-------
 vslib/src/Makefile.am |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6acb71610342..c1b76c03d63d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([subdir-objects foreign])
+AM_INIT_AUTOMAKE([subdir-objects foreign serial-tests])
 AC_LANG_C
 AC_LANG([C++])
 AC_PROG_CC
diff --git a/debian/compat b/debian/compat
index ec635144f600..f599e28b8ab0 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/meta/Makefile.am b/meta/Makefile.am
index cd2013b20d16..a99243207317 100644
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@ -60,23 +60,27 @@ WARN = \
 # NOTE: this compilation could be moved to configure.ac
 
 libsaimeta_la_SOURCES =  \
-					  ../SAI/meta/saimetadata.c \
-					  ../SAI/meta/saimetadatautils.c \
-					  ../SAI/meta/saiserialize.c
+					  $(top_srcdir)/SAI/meta/saimetadata.c \
+					  $(top_srcdir)/SAI/meta/saimetadatautils.c \
+					  $(top_srcdir)/SAI/meta/saiserialize.c
 
 libsaimeta_la_CFLAGS = $(DBGFLAGS) $(WARN)
 
-../SAI/meta/saimetadata.h ../SAI/meta/saimetadata.c:
-	make -C ../SAI/meta
+$(top_srcdir)/SAI/meta/saimetadata.h $(top_srcdir)/SAI/meta/saimetadata.c: saimeta-gen
+
+saimeta-gen:
+	make -C $(top_srcdir)/SAI/meta
 
 clean-local:
-	make -C ../SAI/meta clean
+	make -C $(top_srcdir)/SAI/meta clean
 
 libsaimetadata_la_SOURCES = \
 							sai_meta.cpp \
 							saiattributelist.cpp \
 							saiserialize.cpp
 
+BUILT_SOURCES = $(top_srcdir)/SAI/meta/saimetadata.h $(top_srcdir)/SAI/meta/saimetadata.c
+
 libsaimetadata_la_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON)
 libsaimetadata_la_LIBADD = -lhiredis -lswsscommon libsaimeta.la
 
@@ -84,6 +88,6 @@ bin_PROGRAMS = tests
 
 tests_SOURCES = tests.cpp
 tests_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON)
-tests_LDADD = -lhiredis -lswsscommon -lpthread -L$(top_dir)/meta/.libs -lsaimetadata -lsaimeta
+tests_LDADD = -lhiredis -lswsscommon -lpthread libsaimetadata.la libsaimeta.la
 
 TESTS = tests
diff --git a/vslib/src/Makefile.am b/vslib/src/Makefile.am
index f2a14d85ab82..dc3fd73f070e 100644
--- a/vslib/src/Makefile.am
+++ b/vslib/src/Makefile.am
@@ -65,6 +65,6 @@ bin_PROGRAMS = tests
 
 tests_SOURCES = tests.cpp
 tests_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON)
-tests_LDADD = -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/vslib/src/.libs -lsaivs -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta
+tests_LDADD = -lhiredis -lswsscommon -lpthread libsaivs.la $(top_srcdir)/meta/libsaimetadata.la $(top_srcdir)/meta/libsaimeta.la
 
 TESTS = tests