GNOME.org
 

[folks] build: Rename AM_VALAFLAGS to TARGET_VALAFLAGS in configure.ac

commit 43d92e79f349608bb9cee2158043bc07b50a9b27
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Mon Nov 11 10:58:41 2013 +0000

    build: Rename AM_VALAFLAGS to TARGET_VALAFLAGS in configure.ac
    
    Remembering to always append to AM_VALAFLAGS, rather than define it from
    scratch, is hard and error-prone. Simpler and more consistent to define a
    new variable, TARGET_VALAFLAGS, which must be manually included in every
    AM_VALAFLAGS or target-specific *_VALAFLAGS declaration.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=712274

 backends/backend.mk                   |    1 +
 backends/eds/lib/Makefile.am          |    1 +
 backends/libsocialweb/lib/Makefile.am |    1 +
 backends/telepathy/lib/Makefile.am    |    7 +++++--
 backends/tracker/lib/Makefile.am      |    1 +
 configure.ac                          |    6 +++---
 folks/Makefile.am                     |    2 ++
 tests/lib/Makefile.am                 |    3 ++-
 tests/lib/eds/Makefile.am             |    3 ++-
 tests/lib/key-file/Makefile.am        |    3 ++-
 tests/lib/libsocialweb/Makefile.am    |    3 ++-
 tests/lib/telepathy/Makefile.am       |    3 ++-
 tests/lib/tracker/Makefile.am         |    3 ++-
 tools/Makefile.am                     |    4 +++-
 tools/inspect/Makefile.am             |    4 +++-
 15 files changed, 32 insertions(+), 13 deletions(-)
---
diff --git a/backends/backend.mk b/backends/backend.mk
index 16f14f9..78bbd00 100644
--- a/backends/backend.mk
+++ b/backends/backend.mk
@@ -31,6 +31,7 @@ backend_sources = \
 
 backend_valaflags = \
        $(AM_VALAFLAGS) \
+       $(TARGET_VALAFLAGS) \
        $(ERROR_VALAFLAGS) \
        --vapidir=. \
        --vapidir=$(top_srcdir)/folks \
diff --git a/backends/eds/lib/Makefile.am b/backends/eds/lib/Makefile.am
index bf6b520..2a846d8 100644
--- a/backends/eds/lib/Makefile.am
+++ b/backends/eds/lib/Makefile.am
@@ -34,6 +34,7 @@ libfolks_eds_la_SOURCES = \
 
 libfolks_eds_la_VALAFLAGS = \
        $(AM_VALAFLAGS) \
+       $(TARGET_VALAFLAGS) \
        $(ERROR_VALAFLAGS) \
        --vapidir=. \
        --vapidir=$(top_srcdir)/folks \
diff --git a/backends/libsocialweb/lib/Makefile.am b/backends/libsocialweb/lib/Makefile.am
index 5c26f52..bff4dde 100644
--- a/backends/libsocialweb/lib/Makefile.am
+++ b/backends/libsocialweb/lib/Makefile.am
@@ -33,6 +33,7 @@ libfolks_libsocialweb_la_SOURCES = \
 
 libfolks_libsocialweb_la_VALAFLAGS = \
        $(AM_VALAFLAGS) \
+       $(TARGET_VALAFLAGS) \
        $(ERROR_VALAFLAGS) \
        --vapidir=. \
        --vapidir=$(top_srcdir)/folks \
diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am
index 6b81966..fab531c 100644
--- a/backends/telepathy/lib/Makefile.am
+++ b/backends/telepathy/lib/Makefile.am
@@ -147,8 +147,9 @@ libtp_zeitgeist_dummy_la_LIBADD = \
        $(NULL)
 
 libtp_zeitgeist_la_VALAFLAGS = \
-       $(ERROR_VALAFLAGS) \
        $(AM_VALAFLAGS) \
+       $(TARGET_VALAFLAGS) \
+       $(ERROR_VALAFLAGS) \
        --vapidir=$(abs_top_srcdir)/folks \
        --vapidir=$(abs_top_builddir)/folks \
        --pkg gobject-2.0 \
@@ -164,8 +165,9 @@ libtp_zeitgeist_la_VALAFLAGS = \
        -g \
        $(NULL)
 libtp_zeitgeist_dummy_la_VALAFLAGS = \
-       $(ERROR_VALAFLAGS) \
        $(AM_VALAFLAGS) \
+       $(TARGET_VALAFLAGS) \
+       $(ERROR_VALAFLAGS) \
        --vapidir=$(abs_top_srcdir)/folks \
        --vapidir=$(abs_top_builddir)/folks \
        --pkg gobject-2.0 \
@@ -212,6 +214,7 @@ libfolks_telepathy_la_SOURCES = \
 
 libfolks_telepathy_la_VALAFLAGS = \
        $(AM_VALAFLAGS) \
+       $(TARGET_VALAFLAGS) \
        $(ERROR_VALAFLAGS) \
        --gir=FolksTelepathy-$(API_VERSION_DOT).gir \
        --library=folks-telepathy \
diff --git a/backends/tracker/lib/Makefile.am b/backends/tracker/lib/Makefile.am
index 3e1ebe8..aab9400 100644
--- a/backends/tracker/lib/Makefile.am
+++ b/backends/tracker/lib/Makefile.am
@@ -16,6 +16,7 @@ libfolks_tracker_la_SOURCES = \
 
 libfolks_tracker_la_VALAFLAGS = \
        $(AM_VALAFLAGS) \
+       $(TARGET_VALAFLAGS) \
        $(ERROR_VALAFLAGS) \
        --vapidir=. \
        --vapidir=$(top_srcdir)/folks \
diff --git a/configure.ac b/configure.ac
index 558a49a..d7322b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -340,10 +340,10 @@ AS_IF([test "x$enable_vala" = "xyes"], [
 
         # require GLib >= 2.24 so GLib.Array, etc. reffing is handled
         # automatically
-        AM_VALAFLAGS="--target-glib=2.24"
+        TARGET_VALAFLAGS="--target-glib=2.24"
         # within the libfolks tree, select inline code paths
-        AM_VALAFLAGS="$AM_VALAFLAGS -D FOLKS_COMPILATION"
-        AC_SUBST([AM_VALAFLAGS])
+        TARGET_VALAFLAGS="$TARGET_VALAFLAGS -D FOLKS_COMPILATION"
+        AC_SUBST([TARGET_VALAFLAGS])
         AC_SUBST([VAPIGENFLAGS])
         AC_SUBST([VAPIDIR])
 
diff --git a/folks/Makefile.am b/folks/Makefile.am
index 915d950..a4af6aa 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -23,6 +23,7 @@ libfolks_internal_la_SOURCES = \
 
 libfolks_internal_la_VALAFLAGS = \
        $(AM_VALAFLAGS) \
+       $(TARGET_VALAFLAGS) \
        $(ERROR_VALAFLAGS) \
        --library=folks-internal \
        --vapidir=$(abs_srcdir) \
@@ -111,6 +112,7 @@ endif
 
 libfolks_la_VALAFLAGS = \
        $(AM_VALAFLAGS) \
+       $(TARGET_VALAFLAGS) \
        $(ERROR_VALAFLAGS) \
        --gir=Folks-$(API_VERSION_DOT).gir \
        --library=folks \
diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 23b2707..5c9df41 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -74,8 +74,9 @@ libfolks_test_la_LIBADD = \
        $(NULL)
 
 libfolks_test_la_VALAFLAGS = \
-       $(ERROR_VALAFLAGS) \
        $(AM_VALAFLAGS) \
+       $(TARGET_VALAFLAGS) \
+       $(ERROR_VALAFLAGS) \
        --vapidir=$(abs_top_srcdir)/folks \
        --vapidir=$(abs_top_builddir)/folks \
        --pkg gobject-2.0 \
diff --git a/tests/lib/eds/Makefile.am b/tests/lib/eds/Makefile.am
index ab42673..dddb57f 100644
--- a/tests/lib/eds/Makefile.am
+++ b/tests/lib/eds/Makefile.am
@@ -1,8 +1,9 @@
 noinst_LTLIBRARIES = libeds-test.la
 
 libeds_test_la_VALAFLAGS = \
-       $(ERROR_VALAFLAGS) \
        $(AM_VALAFLAGS) \
+       $(TARGET_VALAFLAGS) \
+       $(ERROR_VALAFLAGS) \
        --library eds-test \
        --vapi eds-test.vapi \
        --header eds-test.h \
diff --git a/tests/lib/key-file/Makefile.am b/tests/lib/key-file/Makefile.am
index 1123eac..ebb067b 100644
--- a/tests/lib/key-file/Makefile.am
+++ b/tests/lib/key-file/Makefile.am
@@ -1,8 +1,9 @@
 noinst_LTLIBRARIES = libkf-test.la
 
 libkf_test_la_VALAFLAGS = \
-       $(ERROR_VALAFLAGS) \
        $(AM_VALAFLAGS) \
+       $(TARGET_VALAFLAGS) \
+       $(ERROR_VALAFLAGS) \
        --library kf-test \
        --vapi kf-test.vapi \
        --header kf-test.h \
diff --git a/tests/lib/libsocialweb/Makefile.am b/tests/lib/libsocialweb/Makefile.am
index d55d439..f186fe5 100644
--- a/tests/lib/libsocialweb/Makefile.am
+++ b/tests/lib/libsocialweb/Makefile.am
@@ -1,8 +1,9 @@
 noinst_LTLIBRARIES = libsocialweb-test.la
 
 libsocialweb_test_la_VALAFLAGS = \
-       $(ERROR_VALAFLAGS) \
        $(AM_VALAFLAGS) \
+       $(TARGET_VALAFLAGS) \
+       $(ERROR_VALAFLAGS) \
        --library libsocialweb-test \
        --vapi libsocialweb-test.vapi \
        --header libsocialweb-test.h \
diff --git a/tests/lib/telepathy/Makefile.am b/tests/lib/telepathy/Makefile.am
index b3c089c..159073b 100644
--- a/tests/lib/telepathy/Makefile.am
+++ b/tests/lib/telepathy/Makefile.am
@@ -5,8 +5,9 @@ SUBDIRS = \
 noinst_LTLIBRARIES = libtpf-test.la
 
 libtpf_test_la_VALAFLAGS = \
-       $(ERROR_VALAFLAGS) \
        $(AM_VALAFLAGS) \
+       $(TARGET_VALAFLAGS) \
+       $(ERROR_VALAFLAGS) \
        --library tpf-test \
        --vapi tpf-test.vapi \
        --header tpf-test.h \
diff --git a/tests/lib/tracker/Makefile.am b/tests/lib/tracker/Makefile.am
index d09256a..02a4c5a 100644
--- a/tests/lib/tracker/Makefile.am
+++ b/tests/lib/tracker/Makefile.am
@@ -1,8 +1,9 @@
 noinst_LTLIBRARIES = libtracker-test.la
 
 libtracker_test_la_VALAFLAGS = \
-       $(ERROR_VALAFLAGS) \
        $(AM_VALAFLAGS) \
+       $(TARGET_VALAFLAGS) \
+       $(ERROR_VALAFLAGS) \
        --library tracker-test \
        --vapi tracker-test.vapi \
        --header tracker-test.h \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 615fb17..dfdaaf0 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -10,7 +10,9 @@ if ENABLE_IMPORT_TOOL
 bin_PROGRAMS = folks-import
 endif
 
-AM_VALAFLAGS += \
+AM_VALAFLAGS = \
+       $(TARGET_VALAFLAGS) \
+       $(ERROR_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 e45d1ec..d0103b1 100644
--- a/tools/inspect/Makefile.am
+++ b/tools/inspect/Makefile.am
@@ -1,4 +1,6 @@
-AM_VALAFLAGS += \
+AM_VALAFLAGS = \
+       $(TARGET_VALAFLAGS) \
+       $(ERROR_VALAFLAGS) \
        --vapidir=$(top_srcdir)/folks \
        --pkg=posix \
        --pkg=readline \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]