summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2010-05-26 18:44:23 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2010-06-16 12:20:59 +0100
commit92fc828a2f64900cb427869dc42210cae8d9b1b9 (patch)
tree44b6cb5c3d9e1c834b24a763e3de2a9c23fe3047
parentf30c6e3cb84fb67b097e3fc84761078ede4c090e (diff)
downloadtelepathy-mission-control-92fc828a2f64900cb427869dc42210cae8d9b1b9.tar.gz
Enable ERROR_CFLAGS in every Makefile.am that compiles C
-rw-r--r--examples/Makefile.am1
-rw-r--r--libmcclient/Makefile.am2
-rw-r--r--server/Makefile.am2
-rw-r--r--src/Makefile.am2
-rw-r--r--test/Makefile.am2
-rw-r--r--test/twisted/Makefile.am2
-rw-r--r--util/Makefile.am1
7 files changed, 12 insertions, 0 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am
index f1e3e53c..8c3449c7 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,4 +1,5 @@
INCLUDES = $(TELEPATHY_CFLAGS) -I$(top_srcdir)
+AM_CFLAGS = $(ERROR_CFLAGS)
noinst_PROGRAMS = mc-example mc-example-2 mc-example-3
mc_example_SOURCES = mc-example.c
diff --git a/libmcclient/Makefile.am b/libmcclient/Makefile.am
index b27baa55..5e11c731 100644
--- a/libmcclient/Makefile.am
+++ b/libmcclient/Makefile.am
@@ -7,6 +7,8 @@ INCLUDES = \
-DLIBDIR="@libdir@" -DLIBVERSION="0" \
-DG_LOG_DOMAIN=\"mc-client\"
+AM_CFLAGS = $(ERROR_CFLAGS)
+
BUILT_SOURCES = \
_gen/libmcclient.xml \
mc-signals-marshal.c \
diff --git a/server/Makefile.am b/server/Makefile.am
index eab3b03e..8d5bc2b2 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -4,6 +4,8 @@ INCLUDES = $(DBUS_CFLAGS) $(TELEPATHY_CFLAGS) -I$(top_srcdir) \
-DMC_DISABLE_DEPRECATED \
-DLIBDIR="@libdir@" -DLIBVERSION="0"
+AM_CFLAGS = $(ERROR_CFLAGS)
+
if HAVE_SERVER
EXTRA_DIST = org.freedesktop.Telepathy.MissionControl5.service.in \
diff --git a/src/Makefile.am b/src/Makefile.am
index 56434a5f..b856049e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,6 +5,8 @@ INCLUDES = \
-DG_LOG_DOMAIN=\"mcd\" \
-DMC_DISABLE_DEPRECATED -I$(top_srcdir)
+AM_CFLAGS = $(ERROR_CFLAGS)
+
if ENABLE_GNOME_KEYRING
INCLUDES += $(GNOME_KEYRING_CFLAGS)
endif
diff --git a/test/Makefile.am b/test/Makefile.am
index d57d711d..454e9d20 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -8,6 +8,8 @@ INCLUDES = \
-DMC_DISABLE_DEPRECATED \
-DLIBDIR="@libdir@" -DLIBVERSION="0"
+AM_CFLAGS = $(ERROR_CFLAGS)
+
if ENABLE_GNOME_KEYRING
INCLUDES += $(GNOME_KEYRING_CFLAGS)
endif
diff --git a/test/twisted/Makefile.am b/test/twisted/Makefile.am
index e0c72acb..5b9dd363 100644
--- a/test/twisted/Makefile.am
+++ b/test/twisted/Makefile.am
@@ -76,6 +76,8 @@ TWISTED_SEPARATE_TESTS = \
crash-recovery/crash-recovery.py \
dispatcher/create-at-startup.py
+AM_CFLAGS = $(ERROR_CFLAGS)
+
if ENABLE_PLUGINS
# A demo dispatcher plugin
noinst_LTLIBRARIES = test-plugin.la
diff --git a/util/Makefile.am b/util/Makefile.am
index 0d53c9a4..bfdab8cd 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,4 +1,5 @@
INCLUDES = $(TELEPATHY_CFLAGS) $(GLIB_CFLAGS) -I$(top_srcdir)
+AM_CFLAGS = $(ERROR_CFLAGS)
bin_PROGRAMS = mc-tool mc-wait-for-name