This defines an empty AUTOMAKE_OPTIONS in the test/Makefile.inc so that all file that includes it can use += to add more options.
This way, platform can add their own AUTOMAKE_OPTIONS options in the platform/@platform@/Makefile.inc. Signed-off-by: Nicolas Morey-Chaisemartin <nmo...@kalray.eu> --- test/Makefile.inc | 2 ++ test/validation/Makefile.inc | 2 +- test/validation/common/Makefile.am | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/Makefile.inc b/test/Makefile.inc index 2700b18..0c2580d 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS = + include $(top_srcdir)/platform/@with_platform@/Makefile.inc LIB = $(top_builddir)/lib diff --git a/test/validation/Makefile.inc b/test/validation/Makefile.inc index 49efbda..5169b3f 100644 --- a/test/validation/Makefile.inc +++ b/test/validation/Makefile.inc @@ -5,7 +5,7 @@ COMMON_DIR = $(top_builddir)/test/validation/common #the following option ensure that option '-I.' is not passed to gcc, #therefore distinguishing between '#include "X"' and '#include <X>'. #It allows common filenames (such as 'errno.h') to be used locally. -AUTOMAKE_OPTIONS = nostdinc +AUTOMAKE_OPTIONS += nostdinc AM_CFLAGS += -I$(top_srcdir)/test/validation/common AM_LDFLAGS += -static diff --git a/test/validation/common/Makefile.am b/test/validation/common/Makefile.am index 2cb0956..f54bbe9 100644 --- a/test/validation/common/Makefile.am +++ b/test/validation/common/Makefile.am @@ -1,5 +1,5 @@ -AUTOMAKE_OPTIONS = foreign include $(top_srcdir)/test/Makefile.inc +AUTOMAKE_OPTIONS += foreign noinst_LTLIBRARIES = libcunit_common.la libcpumask_common.la libthrmask_common.la _______________________________________________ lng-odp mailing list lng-odp@lists.linaro.org https://lists.linaro.org/mailman/listinfo/lng-odp
