Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[debian] increment debian compatibility to 10 to enable parallel package build #461

Merged
merged 3 commits into from
Jun 4, 2019
Merged

[debian] increment debian compatibility to 10 to enable parallel package build #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31c762e
fix parallel build
May 24, 2019
c7f2047
[debian] increment debian compatibility to 10 to enable parallel package
May 24, 2019
e578288
make tests run serial
Jun 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great

AC_LANG_C
AC_LANG([C++])
AC_PROG_CC
Expand Down
2 changes: 1 addition & 1 deletion debian/compat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
18 changes: 11 additions & 7 deletions meta/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,30 +60,34 @@ 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

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
2 changes: 1 addition & 1 deletion vslib/src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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