[folks] Use ERROR_VALAFLAGS as intended.
- From: Travis Reitter <treitter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks] Use ERROR_VALAFLAGS as intended.
- Date: Thu, 25 Aug 2011 22:27:57 +0000 (UTC)
commit 94dca5969265601e9ca8c9ae044e8fe9b3a13214
Author: Travis Reitter <travis reitter collabora co uk>
Date: Thu Aug 25 15:06:19 2011 -0700
Use ERROR_VALAFLAGS as intended.
backends/eds/Makefile.am | 1 +
backends/eds/lib/Makefile.am | 1 +
backends/libsocialweb/Makefile.am | 1 +
backends/libsocialweb/lib/Makefile.am | 1 +
backends/telepathy/Makefile.am | 1 +
backends/telepathy/lib/Makefile.am | 1 +
backends/tracker/Makefile.am | 1 +
backends/tracker/lib/Makefile.am | 1 +
folks/Makefile.am | 2 ++
tests/eds/Makefile.am | 1 +
tests/folks/Makefile.am | 1 +
tests/key-file/Makefile.am | 1 +
tests/lib/Makefile.am | 1 +
tests/lib/eds/Makefile.am | 1 +
tests/lib/key-file/Makefile.am | 1 +
tests/lib/libsocialweb/Makefile.am | 1 +
tests/lib/tracker/Makefile.am | 1 +
tests/libsocialweb/Makefile.am | 1 +
tests/telepathy/Makefile.am | 1 +
tests/tracker/Makefile.am | 1 +
20 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/backends/eds/Makefile.am b/backends/eds/Makefile.am
index 7d53c70..975ea46 100644
--- a/backends/eds/Makefile.am
+++ b/backends/eds/Makefile.am
@@ -13,6 +13,7 @@ AM_CPPFLAGS = \
$(NULL)
VALAFLAGS += \
+ $(ERROR_VALAFLAGS) \
--vapidir=. \
--vapidir=$(top_builddir)/backends/eds/lib \
--vapidir=$(top_srcdir)/folks \
diff --git a/backends/eds/lib/Makefile.am b/backends/eds/lib/Makefile.am
index 4dc22bf..2e52c43 100644
--- a/backends/eds/lib/Makefile.am
+++ b/backends/eds/lib/Makefile.am
@@ -41,6 +41,7 @@ libfolks_eds_la_SOURCES = \
# to factor out repetition, but automake's Vala support doesn't like it
# because it assumes it can simply match every flag in any _VALAFLAGS string.
libfolks_eds_la_VALAFLAGS = \
+ $(ERROR_VALAFLAGS) \
--vapidir=. \
--vapidir=$(top_srcdir)/folks \
--pkg folks \
diff --git a/backends/libsocialweb/Makefile.am b/backends/libsocialweb/Makefile.am
index b578e9f..1ced164 100644
--- a/backends/libsocialweb/Makefile.am
+++ b/backends/libsocialweb/Makefile.am
@@ -13,6 +13,7 @@ AM_CPPFLAGS = \
$(NULL)
VALAFLAGS += \
+ $(ERROR_VALAFLAGS) \
--vapidir=. \
--vapidir=$(top_builddir)/backends/libsocialweb/lib \
--vapidir=$(top_srcdir)/folks \
diff --git a/backends/libsocialweb/lib/Makefile.am b/backends/libsocialweb/lib/Makefile.am
index eda0df1..1f49bcf 100644
--- a/backends/libsocialweb/lib/Makefile.am
+++ b/backends/libsocialweb/lib/Makefile.am
@@ -36,6 +36,7 @@ libfolks_libsocialweb_la_SOURCES = \
$(NULL)
libfolks_libsocialweb_la_VALAFLAGS = \
+ $(ERROR_VALAFLAGS) \
--vapidir=. \
--vapidir=$(top_srcdir)/folks \
--pkg folks \
diff --git a/backends/telepathy/Makefile.am b/backends/telepathy/Makefile.am
index d54c8c5..b5a9dec 100644
--- a/backends/telepathy/Makefile.am
+++ b/backends/telepathy/Makefile.am
@@ -13,6 +13,7 @@ AM_CPPFLAGS = \
$(NULL)
VALAFLAGS += \
+ $(ERROR_VALAFLAGS) \
--vapidir=. \
--vapidir=$(top_builddir)/backends/telepathy/lib \
--vapidir=$(top_srcdir)/folks \
diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am
index 7d3cd01..8d8888c 100644
--- a/backends/telepathy/lib/Makefile.am
+++ b/backends/telepathy/lib/Makefile.am
@@ -105,6 +105,7 @@ libfolks_telepathy_la_SOURCES = \
$(NULL)
libfolks_telepathy_la_VALAFLAGS = \
+ $(ERROR_VALAFLAGS) \
--vapidir=. \
--vapidir=$(top_srcdir)/folks \
--pkg folks \
diff --git a/backends/tracker/Makefile.am b/backends/tracker/Makefile.am
index eb7aa67..c218599 100644
--- a/backends/tracker/Makefile.am
+++ b/backends/tracker/Makefile.am
@@ -13,6 +13,7 @@ AM_CPPFLAGS = \
$(NULL)
VALAFLAGS += \
+ $(ERROR_VALAFLAGS) \
--vapidir=. \
--vapidir=vapi \
--vapidir=$(top_builddir)/backends/tracker/lib \
diff --git a/backends/tracker/lib/Makefile.am b/backends/tracker/lib/Makefile.am
index 7a9a4f6..99f82bd 100644
--- a/backends/tracker/lib/Makefile.am
+++ b/backends/tracker/lib/Makefile.am
@@ -36,6 +36,7 @@ libfolks_tracker_la_SOURCES = \
$(NULL)
libfolks_tracker_la_VALAFLAGS = \
+ $(VALAFLAGS) \
--vapidir=. \
--vapidir=$(top_srcdir)/folks \
--pkg folks \
diff --git a/folks/Makefile.am b/folks/Makefile.am
index a4d03ea..1df6b10 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -49,6 +49,7 @@ EDS_FLAGS = -D ENABLE_EDS
endif
libfolks_la_VALAFLAGS = \
+ $(ERROR_VALAFLAGS) \
--gir=Folks-$(API_VERSION).gir \
--library=folks \
--vapidir=. \
@@ -65,6 +66,7 @@ libfolks_la_VALAFLAGS = \
$(NULL)
libfolks_la_CFLAGS = \
+ $(ERROR_CFLAGS) \
$(GIO_CFLAGS) \
$(GLIB_CFLAGS) \
$(GMODULE_CFLAGS) \
diff --git a/tests/eds/Makefile.am b/tests/eds/Makefile.am
index 54e134c..d43001c 100644
--- a/tests/eds/Makefile.am
+++ b/tests/eds/Makefile.am
@@ -23,6 +23,7 @@ LDADD = \
$(NULL)
AM_VALAFLAGS = \
+ $(ERROR_VALAFLAGS) \
--vapidir=. \
--vapidir=$(top_srcdir)/folks \
--vapidir=$(top_srcdir)/backends/eds/lib \
diff --git a/tests/folks/Makefile.am b/tests/folks/Makefile.am
index a37bd78..0bfa548 100644
--- a/tests/folks/Makefile.am
+++ b/tests/folks/Makefile.am
@@ -23,6 +23,7 @@ LDADD = \
RUN_WITH_PRIVATE_BUS = $(top_srcdir)/tests/tools/with-session-bus.sh
AM_VALAFLAGS = \
+ $(ERROR_VALAFLAGS) \
--vapidir=. \
--vapidir=$(top_srcdir)/folks \
--vapidir=$(top_srcdir)/tests/lib \
diff --git a/tests/key-file/Makefile.am b/tests/key-file/Makefile.am
index 1e42695..9aae008 100644
--- a/tests/key-file/Makefile.am
+++ b/tests/key-file/Makefile.am
@@ -16,6 +16,7 @@ LDADD = \
$(NULL)
AM_VALAFLAGS = \
+ $(ERROR_VALAFLAGS) \
--vapidir=. \
--vapidir=$(top_srcdir)/folks \
--vapidir=$(top_srcdir)/tests/lib \
diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 428131c..54ac42d 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -30,6 +30,7 @@ libfolks_test_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS)
libfolks_test_la_LIBADD = $(GLIB_LIBS) $(GIO_LIBS)
libfolks_test_la_VALAFLAGS = \
+ $(ERROR_VALAFLAGS) \
$(VALAFLAGS) \
--pkg gobject-2.0 \
--pkg gio-2.0 \
diff --git a/tests/lib/eds/Makefile.am b/tests/lib/eds/Makefile.am
index cc48639..030ab79 100644
--- a/tests/lib/eds/Makefile.am
+++ b/tests/lib/eds/Makefile.am
@@ -1,4 +1,5 @@
VALAFLAGS += \
+ $(ERROR_VALAFLAGS) \
--library=eds-test \
--header=eds-test.h \
--vapidir=$(top_srcdir)/folks \
diff --git a/tests/lib/key-file/Makefile.am b/tests/lib/key-file/Makefile.am
index 2bfc3be..495496d 100644
--- a/tests/lib/key-file/Makefile.am
+++ b/tests/lib/key-file/Makefile.am
@@ -1,4 +1,5 @@
VALAFLAGS += \
+ $(ERROR_VALAFLAGS) \
--library=kf-test \
--header=kf-test.h \
--vapidir=. \
diff --git a/tests/lib/libsocialweb/Makefile.am b/tests/lib/libsocialweb/Makefile.am
index 56158a9..09ae0f9 100644
--- a/tests/lib/libsocialweb/Makefile.am
+++ b/tests/lib/libsocialweb/Makefile.am
@@ -1,4 +1,5 @@
VALAFLAGS += \
+ $(ERROR_VALAFLAGS) \
--library=libsocialweb-test \
--header=libsocialweb-test.h \
--vapidir=$(top_srcdir)/folks \
diff --git a/tests/lib/tracker/Makefile.am b/tests/lib/tracker/Makefile.am
index 8c52165..c8520c8 100644
--- a/tests/lib/tracker/Makefile.am
+++ b/tests/lib/tracker/Makefile.am
@@ -1,4 +1,5 @@
VALAFLAGS += \
+ $(ERROR_VALAFLAGS) \
--library=tracker-test \
--header=tracker-test.h \
--vapidir=$(top_srcdir)/folks \
diff --git a/tests/libsocialweb/Makefile.am b/tests/libsocialweb/Makefile.am
index 6c037c7..53fe1f7 100644
--- a/tests/libsocialweb/Makefile.am
+++ b/tests/libsocialweb/Makefile.am
@@ -25,6 +25,7 @@ LDADD = \
RUN_WITH_PRIVATE_BUS = $(top_srcdir)/tests/tools/with-session-bus.sh
AM_VALAFLAGS = \
+ $(ERROR_VALAFLAGS) \
--vapidir=. \
--vapidir=$(top_srcdir)/folks \
--vapidir=$(top_srcdir)/backends/libsocialweb/lib \
diff --git a/tests/telepathy/Makefile.am b/tests/telepathy/Makefile.am
index bfc0ba5..9c5f935 100644
--- a/tests/telepathy/Makefile.am
+++ b/tests/telepathy/Makefile.am
@@ -25,6 +25,7 @@ LDADD = \
RUN_WITH_PRIVATE_BUS = $(top_srcdir)/tests/tools/with-session-bus.sh
AM_VALAFLAGS = \
+ $(ERROR_VALAFLAGS) \
--vapidir=$(top_builddir)/tests/lib/telepathy/contactlist/ \
--vapidir=$(top_builddir)/tests/lib/ \
--vapidir=. \
diff --git a/tests/tracker/Makefile.am b/tests/tracker/Makefile.am
index bb58efd..b3e1267 100644
--- a/tests/tracker/Makefile.am
+++ b/tests/tracker/Makefile.am
@@ -25,6 +25,7 @@ LDADD = \
RUN_WITH_PRIVATE_BUS = $(top_srcdir)/tests/tools/with-session-bus-tracker.sh
AM_VALAFLAGS = \
+ $(ERROR_VALAFLAGS) \
--vapidir=. \
--vapidir=$(top_srcdir)/folks \
--vapidir=$(top_srcdir)/backends/tracker/lib \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]