* build-aux/build_unit_test.sh: Write Make variables with parentheses instead of braces. Add a space before `='. --- ChangeLog | 8 ++++++++ build-aux/build_unit_test.sh | 14 +++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 154b20b..b366f8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2013-09-11 Roland Levillain <roland@lrde.epita.fr> + Generate more uniform Makefile helpers for unit tests. + + * build-aux/build_unit_test.sh: Write Make variables with + parentheses instead of braces. + Add a space before `='. + +2013-09-11 Roland Levillain <roland@lrde.epita.fr> + * build-aux/build_unit_test.sh: Properly handle QT_LIBS. 2013-09-09 Roland Levillain <roland@lrde.epita.fr> diff --git a/build-aux/build_unit_test.sh b/build-aux/build_unit_test.sh index 7f4748f..7b06879 100755 --- a/build-aux/build_unit_test.sh +++ b/build-aux/build_unit_test.sh @@ -112,20 +112,20 @@ EOF # Write specific flags if there are dependencies. if ! (test -z "$IFDEF"); then - cppflags="${NAME}_CPPFLAGS=" - ldflags="${NAME}_LDFLAGS=" + cppflags="${NAME}_CPPFLAGS =" + ldflags="${NAME}_LDFLAGS =" for i in $IFDEF; do - cppflags="${cppflags} \${${i}_CPPFLAGS} -DHAVE_${i}" - ldflags="${ldflags} \${${i}_LDFLAGS} " + cppflags="${cppflags} \$(${i}_CPPFLAGS) -DHAVE_${i}" + ldflags="${ldflags} \$(${i}_LDFLAGS)" done - echo "$cppflags \${AM_CPPFLAGS}" >>"$output" - echo "$ldflags \${AM_LDFLAGS}" >>"$output" + echo "$cppflags \$(AM_CPPFLAGS)" >>"$output" + echo "$ldflags \$(AM_LDFLAGS)" >>"$output" # Local hack: Handle the special case of Qt, which defines # QT_LIBS, to be use for with ${NAME}_LDADD variables. for i in $IFDEF; do if test "x$i" = xQT; then - echo "${NAME}_LDADD= \${QT_LIBS} \${LDADD}" >>"$output" + echo "${NAME}_LDADD = \$(QT_LIBS) \$(LDADD)" >>"$output" fi done fi -- 1.7.10.4