diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-03-11 13:12:02 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-03-12 14:35:58 +0000 |
| commit | 225f7042476504cedc1b35a7d2c91d7876841ec3 (patch) | |
| tree | d824b03641249eaea2c87186c3d029631569b53f /tools | |
| parent | c8155b0232b9e084bc8f5c76239a3192eabb6ae6 (diff) | |
Do not assign to VALAFLAGS
Users should be able to do "make VALAFLAGS=--enable-experimental-non-null"
without overriding necessary flags like --target-glib=2.24. The variable
for use by package maintainers is AM_VALAFLAGS.
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=695628
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Philip Withnall <philip@tecnocode.co.uk>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 3 | ||||
| -rw-r--r-- | tools/inspect/Makefile.am | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 4e242722..731908eb 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -10,8 +10,7 @@ if ENABLE_IMPORT_TOOL bin_PROGRAMS = folks-import endif -VALAFLAGS = \ - $(AM_VALAFLAGS) \ +AM_VALAFLAGS += \ --vapidir=$(top_builddir)/folks \ --pkg=gee-0.8 \ --pkg=libxml-2.0 \ diff --git a/tools/inspect/Makefile.am b/tools/inspect/Makefile.am index b62af9a3..376b9d02 100644 --- a/tools/inspect/Makefile.am +++ b/tools/inspect/Makefile.am @@ -1,5 +1,4 @@ -VALAFLAGS = \ - $(AM_VALAFLAGS) \ +AM_VALAFLAGS += \ --vapidir=$(top_srcdir)/folks \ --pkg=posix \ --pkg=readline \ |