From a27c47b2c411b53eb245c387191a45b5308e7384 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Tue, 23 Aug 2016 14:27:19 +0000 Subject: [PATCH] mpers: add MPERS_IS_* to CFLAGS passed to mpers.sh This allows testing of MPERS_IS_* macros in pre-MPERS_DEFS parts of source code. * Makefile.am (mpers-m%.stamp): Add -DMPERS_IS_$(mpers_NAME) to CFLAGS passed to mpers.sh. * mpers_test.sh: Likewise. --- Makefile.am | 2 +- mpers_test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index cae411d4..a9e38218 100644 --- a/Makefile.am +++ b/Makefile.am @@ -774,7 +774,7 @@ libmpers_CFLAGS = $(strace_CFLAGS) mpers-m%.stamp: $(srcdir_mpers_source_files) | printers.h for f in $^; do \ - CC="$(CC)" CFLAGS="$(mpers_sh_opts)" \ + CC="$(CC)" CFLAGS="$(mpers_sh_opts) -DMPERS_IS_$(mpers_NAME)" \ CPP="$(CPP)" CPPFLAGS="$(mpers_sh_opts) -DIN_MPERS -DMPERS_IS_$(mpers_NAME)" \ $(srcdir)/mpers.sh -$(mpers_NAME) $$f || exit; \ done diff --git a/mpers_test.sh b/mpers_test.sh index 72b5f5da..907460b8 100755 --- a/mpers_test.sh +++ b/mpers_test.sh @@ -121,7 +121,7 @@ int16_t f[0]; #define MPERS_${mpers_name}_sample_struct ${mpers_name}_sample_struct EOF -CFLAGS="$CPPFLAGS -I${srcdir}" \ +CFLAGS="$CPPFLAGS -I${srcdir} -DMPERS_IS_${mpers_name}" \ CPPFLAGS="$CPPFLAGS -I${srcdir} -DIN_MPERS -DMPERS_IS_${mpers_name}" \ "$mpers_sh" "-$mpers_name" "$sample" cmp "$expected" "$mpers_dir"/sample_struct.h > /dev/null -- 2.40.0