[folks] build: Tidy up use of AM_* variables in Makefile.ams

From: Philip Withnall <pwithnall src gnome org>
To: commits-list gnome org
Cc:
Subject: [folks] build: Tidy up use of AM_* variables in Makefile.ams
Date: Sun, 8 Jan 2012 23:39:50 +0000 (UTC)
commit f4b46b0cdbea0ef334ffc1fe281440654c40dfea
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun Jan 8 15:50:02 2012 +0000

    build: Tidy up use of AM_* variables in Makefile.ams

 backends/eds/Makefile.am           |   33 +++++++++++++++++++++------------
 backends/eds/lib/Makefile.am       |    4 ++++
 backends/key-file/Makefile.am      |   27 ++++++++++++++++++---------
 backends/libsocialweb/Makefile.am  |   33 +++++++++++++++++++++------------
 backends/telepathy/Makefile.am     |   31 ++++++++++++++++++++-----------
 backends/telepathy/lib/Makefile.am |    9 ++++++++-
 backends/tracker/Makefile.am       |   33 +++++++++++++++++++++------------
 backends/tracker/lib/Makefile.am   |   28 ++++++++++++----------------
 folks/Makefile.am                  |   11 +++++++++++
 tools/Makefile.am                  |   15 +++++++++------
 tools/inspect/Makefile.am          |    8 +++++++-
 11 files changed, 152 insertions(+), 80 deletions(-)
---
diff --git a/backends/eds/Makefile.am b/backends/eds/Makefile.am
index 975ea46..54a22e8 100644
--- a/backends/eds/Makefile.am
+++ b/backends/eds/Makefile.am
@@ -2,17 +2,8 @@ SUBDIRS = lib
 
 BACKEND_NAME = "eds"
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/folks \
-	-I$(top_srcdir)/backends/eds/lib \
-	-I$(top_srcdir)/backends/eds/lib/folks \
-	-include $(CONFIG_HEADER) \
-	-DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
-	-DBACKEND_NAME=\"$(BACKEND_NAME)\" \
-	-DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \
-	$(NULL)
-
 VALAFLAGS += \
+	$(AM_VALAFLAGS) \
 	$(ERROR_VALAFLAGS) \
 	--vapidir=. \
 	--vapidir=$(top_builddir)/backends/eds/lib \
@@ -39,7 +30,18 @@ eds_deps = \
 	libxml-2.0 \
 	$(NULL)
 
+eds_la_CPPFLAGS = \
+	-I$(top_srcdir)/folks \
+	-I$(top_srcdir)/backends/eds/lib \
+	-I$(top_srcdir)/backends/eds/lib/folks \
+	-include $(CONFIG_HEADER) \
+	-DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
+	-DBACKEND_NAME=\"$(BACKEND_NAME)\" \
+	-DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \
+	$(NULL)
+
 eds_la_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GEE_CFLAGS) \
@@ -49,7 +51,8 @@ eds_la_CFLAGS = \
 	$(NULL)
 
 eds_la_LIBADD = \
-	lib/libfolks-eds.la \
+	$(AM_LIBADD) \
+	$(top_builddir)/backends/eds/lib/libfolks-eds.la \
 	$(top_builddir)/folks/libfolks.la \
 	$(GIO_LIBS) \
 	$(GLIB_LIBS) \
@@ -59,7 +62,13 @@ eds_la_LIBADD = \
 	$(LIBXML_LIBS) \
 	$(NULL)
 
-eds_la_LDFLAGS = -shared -fPIC -module -avoid-version
+eds_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	-shared \
+	-fPIC \
+	-module \
+	-avoid-version \
+	$(NULL)
 
 GITIGNOREFILES = \
 	folks-backend-eds.vapi \
diff --git a/backends/eds/lib/Makefile.am b/backends/eds/lib/Makefile.am
index 1c4c02e..a0afdcf 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 = \
+	$(AM_VALAFLAGS) \
 	$(ERROR_VALAFLAGS) \
 	--vapidir=. \
 	--vapidir=$(top_srcdir)/folks \
@@ -58,6 +59,7 @@ libfolks_eds_la_VALAFLAGS = \
 	$(NULL)
 
 libfolks_eds_la_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GEE_CFLAGS) \
@@ -67,6 +69,7 @@ libfolks_eds_la_CFLAGS = \
 	$(NULL)
 
 libfolks_eds_la_LIBADD = \
+	$(AM_LIBADD) \
 	$(top_builddir)/folks/libfolks.la \
 	$(top_builddir)/folks/libfolks-internal.la \
 	$(EBOOK_LIBS) \
@@ -81,6 +84,7 @@ libfolks_eds_la_LIBADD = \
 # that vim quickfix mode (:make) doesn't interpret the libtool --mode=link
 # command as an error message in a bizarrely named file
 libfolks_eds_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
 	-version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" \
 	-export-symbols-regex "^(EDSF|edsf)_.*|" \
 	$(NULL)
diff --git a/backends/key-file/Makefile.am b/backends/key-file/Makefile.am
index 193c47a..ec8b8c7 100644
--- a/backends/key-file/Makefile.am
+++ b/backends/key-file/Makefile.am
@@ -1,13 +1,5 @@
 BACKEND_NAME = "key-file"
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/folks \
-	-include $(CONFIG_HEADER) \
-	-DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
-	-DBACKEND_NAME=\"$(BACKEND_NAME)\" \
-	-DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \
-	$(NULL)
-
 backenddir = $(BACKEND_DIR)/key-file
 backend_LTLIBRARIES = key-file.la
 
@@ -19,6 +11,7 @@ key_file_la_SOURCES = \
 	$(NULL)
 
 key_file_la_VALAFLAGS = \
+	$(AM_VALAFLAGS) \
 	$(ERROR_VALAFLAGS) \
 	--vapidir=. \
 	--vapidir=$(top_srcdir)/folks \
@@ -28,20 +21,36 @@ key_file_la_VALAFLAGS = \
 	--pkg gobject-2.0 \
 	$(NULL)
 
+key_file_la_CPPFLAGS = \
+	-I$(top_srcdir)/folks \
+	-include $(CONFIG_HEADER) \
+	-DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
+	-DBACKEND_NAME=\"$(BACKEND_NAME)\" \
+	-DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \
+	$(NULL)
+
 key_file_la_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GEE_CFLAGS) \
 	$(NULL)
 
 key_file_la_LIBADD = \
+	$(AM_LIBADD) \
 	$(GIO_LIBS) \
 	$(GLIB_LIBS) \
 	$(GEE_LIBS) \
 	$(top_builddir)/folks/libfolks.la \
 	$(NULL)
 
-key_file_la_LDFLAGS = -shared -fPIC -module -avoid-version
+key_file_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	-shared \
+	-fPIC \
+	-module \
+	-avoid-version \
+	$(NULL)
 
 GITIGNOREFILES = \
 	folks-backend-key-file.vapi \
diff --git a/backends/libsocialweb/Makefile.am b/backends/libsocialweb/Makefile.am
index 1ced164..80cc474 100644
--- a/backends/libsocialweb/Makefile.am
+++ b/backends/libsocialweb/Makefile.am
@@ -2,17 +2,8 @@ SUBDIRS = lib
 
 BACKEND_NAME = "libsocialweb"
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/folks \
-	-I$(top_srcdir)/backends/libsocialweb/lib \
-	-I$(top_srcdir)/backends/libsocialweb/lib/folks \
-	-include $(CONFIG_HEADER) \
-	-DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
-	-DBACKEND_NAME=\"$(BACKEND_NAME)\" \
-	-DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \
-	$(NULL)
-
 VALAFLAGS += \
+	$(AM_VALAFLAGS) \
 	$(ERROR_VALAFLAGS) \
 	--vapidir=. \
 	--vapidir=$(top_builddir)/backends/libsocialweb/lib \
@@ -30,14 +21,25 @@ libsocialweb_la_SOURCES = \
 
 libsocialweb_deps = \
 	folks \
-        folks-libsocialweb \
+	folks-libsocialweb \
 	gee-1.0 \
 	gio-2.0 \
 	gobject-2.0 \
 	libsocialweb-client \
 	$(NULL)
 
+libsocialweb_la_CPPFLAGS = \
+	-I$(top_srcdir)/folks \
+	-I$(top_srcdir)/backends/libsocialweb/lib \
+	-I$(top_srcdir)/backends/libsocialweb/lib/folks \
+	-include $(CONFIG_HEADER) \
+	-DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
+	-DBACKEND_NAME=\"$(BACKEND_NAME)\" \
+	-DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \
+	$(NULL)
+
 libsocialweb_la_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GEE_CFLAGS) \
@@ -45,6 +47,7 @@ libsocialweb_la_CFLAGS = \
 	$(NULL)
 
 libsocialweb_la_LIBADD = \
+	$(AM_LIBADD) \
 	$(GIO_LIBS) \
 	$(GLIB_LIBS) \
 	$(GEE_LIBS) \
@@ -53,7 +56,13 @@ libsocialweb_la_LIBADD = \
 	lib/libfolks-libsocialweb.la \
 	$(NULL)
 
-libsocialweb_la_LDFLAGS = -shared -fPIC -module -avoid-version
+libsocialweb_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	-shared \
+	-fPIC \
+	-module \
+	-avoid-version \
+	$(NULL)
 
 GITIGNOREFILES = \
 	folks-backend-libsocialweb.vapi \
diff --git a/backends/telepathy/Makefile.am b/backends/telepathy/Makefile.am
index b5a9dec..5c1e626 100644
--- a/backends/telepathy/Makefile.am
+++ b/backends/telepathy/Makefile.am
@@ -2,17 +2,8 @@ SUBDIRS = lib
 
 BACKEND_NAME = "telepathy"
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/folks \
-	-I$(top_srcdir)/backends/telepathy/lib \
-	-I$(top_srcdir)/backends/telepathy/lib/folks \
-	-include $(CONFIG_HEADER) \
-	-DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
-	-DBACKEND_NAME=\"$(BACKEND_NAME)\" \
-	-DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \
-	$(NULL)
-
 VALAFLAGS += \
+	$(AM_VALAFLAGS) \
 	$(ERROR_VALAFLAGS) \
 	--vapidir=. \
 	--vapidir=$(top_builddir)/backends/telepathy/lib \
@@ -37,7 +28,18 @@ telepathy_deps = \
 	telepathy-glib \
 	$(NULL)
 
+telepathy_la_CPPFLAGS = \
+	-I$(top_srcdir)/folks \
+	-I$(top_srcdir)/backends/telepathy/lib \
+	-I$(top_srcdir)/backends/telepathy/lib/folks \
+	-include $(CONFIG_HEADER) \
+	-DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
+	-DBACKEND_NAME=\"$(BACKEND_NAME)\" \
+	-DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \
+	$(NULL)
+
 telepathy_la_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GEE_CFLAGS) \
@@ -45,6 +47,7 @@ telepathy_la_CFLAGS = \
 	$(NULL)
 
 telepathy_la_LIBADD = \
+	$(AM_LIBADD) \
 	$(GIO_LIBS) \
 	$(GLIB_LIBS) \
 	$(GEE_LIBS) \
@@ -53,7 +56,13 @@ telepathy_la_LIBADD = \
 	lib/libfolks-telepathy.la \
 	$(NULL)
 
-telepathy_la_LDFLAGS = -shared -fPIC -module -avoid-version
+telepathy_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	-shared \
+	-fPIC \
+	-module \
+	-avoid-version \
+	$(NULL)
 
 GITIGNOREFILES = \
 	folks-backend-telepathy.vapi \
diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am
index 4523c7e..35c4442 100644
--- a/backends/telepathy/lib/Makefile.am
+++ b/backends/telepathy/lib/Makefile.am
@@ -27,6 +27,7 @@ libtp_lowlevel_la_SOURCES = \
 tp_lowlevel_headers = tp-lowlevel.h
 
 libtp_lowlevel_la_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(ERROR_CFLAGS) \
 	$(GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \
@@ -38,7 +39,9 @@ libtp_lowlevel_la_CFLAGS = \
 # despite not being installed (it needs to be a shared library for
 # vala-gen-introspect)
 libtp_lowlevel_la_LDFLAGS = \
-	-shared -rpath $(libdir) \
+	$(AM_LDFLAGS) \
+	-shared \
+	-rpath $(libdir) \
 	-avoid-version \
 	$(GIO_LIBS) \
 	$(GLIB_LIBS) \
@@ -106,6 +109,7 @@ libfolks_telepathy_la_SOURCES = \
 	$(NULL)
 
 libfolks_telepathy_la_VALAFLAGS = \
+	$(AM_VALAFLAGS) \
 	$(ERROR_VALAFLAGS) \
 	--vapidir=. \
 	--vapidir=$(top_srcdir)/folks \
@@ -122,6 +126,7 @@ libfolks_telepathy_la_VALAFLAGS = \
 	$(NULL)
 
 libfolks_telepathy_la_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GEE_CFLAGS) \
@@ -129,6 +134,7 @@ libfolks_telepathy_la_CFLAGS = \
 	$(NULL)
 
 libfolks_telepathy_la_LIBADD = \
+	$(AM_LIBADD) \
 	$(GIO_LIBS) \
 	$(GLIB_LIBS) \
 	$(GEE_LIBS) \
@@ -141,6 +147,7 @@ libfolks_telepathy_la_LIBADD = \
 # that vim quickfix mode (:make) doesn't interpret the libtool --mode=link
 # command as an error message in a bizarrely named file
 libfolks_telepathy_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
 	-version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" \
 	-export-symbols-regex "^tpf_.*" \
 	$(NULL)
diff --git a/backends/tracker/Makefile.am b/backends/tracker/Makefile.am
index fb6f22d..d5f383e 100644
--- a/backends/tracker/Makefile.am
+++ b/backends/tracker/Makefile.am
@@ -2,17 +2,8 @@ SUBDIRS = lib
 
 BACKEND_NAME = "tracker"
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/folks \
-	-I$(top_srcdir)/backends/tracker/lib \
-	-I$(top_srcdir)/backends/tracker/lib/folks \
-	-include $(CONFIG_HEADER) \
-	-DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
-	-DBACKEND_NAME=\"$(BACKEND_NAME)\" \
-	-DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \
-	$(NULL)
-
 VALAFLAGS += \
+	$(AM_VALAFLAGS) \
 	$(ERROR_VALAFLAGS) \
 	--vapidir=. \
 	--vapidir=vapi \
@@ -38,7 +29,18 @@ tracker_deps = \
 	tracker-sparql-0.12 \
 	$(NULL)
 
+tracker_la_CPPFLAGS = \
+	-I$(top_srcdir)/folks \
+	-I$(top_srcdir)/backends/tracker/lib \
+	-I$(top_srcdir)/backends/tracker/lib/folks \
+	-include $(CONFIG_HEADER) \
+	-DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
+	-DBACKEND_NAME=\"$(BACKEND_NAME)\" \
+	-DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \
+	$(NULL)
+
 tracker_la_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GEE_CFLAGS) \
@@ -46,15 +48,22 @@ tracker_la_CFLAGS = \
 	$(NULL)
 
 tracker_la_LIBADD = \
+	$(AM_LIBADD) \
 	$(GIO_LIBS) \
 	$(GLIB_LIBS) \
 	$(GEE_LIBS) \
 	$(top_builddir)/folks/libfolks.la \
 	$(TRACKER_SPARQL_LIBS) \
-	lib/libfolks-tracker.la \
+	$(top_builddir)/backends/tracker/lib/libfolks-tracker.la \
 	$(NULL)
 
-tracker_la_LDFLAGS = -shared -fPIC -module -avoid-version
+tracker_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	-shared \
+	-fPIC \
+	-module \
+	-avoid-version \
+	$(NULL)
 
 GITIGNOREFILES = \
 	folks-backend-tracker.vapi \
diff --git a/backends/tracker/lib/Makefile.am b/backends/tracker/lib/Makefile.am
index 885c3ad..215d057 100644
--- a/backends/tracker/lib/Makefile.am
+++ b/backends/tracker/lib/Makefile.am
@@ -1,24 +1,8 @@
 BACKEND_NAME = "tracker"
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/folks \
-	-include $(CONFIG_HEADER) \
-	-DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
-	-DBACKEND_NAME=\"$(BACKEND_NAME)\" \
-	-DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \
-	$(NULL)
-
-VAPIGENFLAGS += \
-	--vapidir=. \
-	--vapidir=$(top_srcdir)/folks
-
 folks_trackerdir = $(libdir)
 folks_tracker_LTLIBRARIES = libfolks-tracker.la
 
-##################################################################
-# Support library
-##################################################################
-
 pkgconfig_in = folks-tracker.pc.in
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pkgconfig_in:.in=)
@@ -36,6 +20,7 @@ libfolks_tracker_la_SOURCES = \
 	$(NULL)
 
 libfolks_tracker_la_VALAFLAGS = \
+	$(AM_VALAFLAGS) \
 	$(ERROR_VALAFLAGS) \
 	--vapidir=. \
 	--vapidir=$(top_srcdir)/folks \
@@ -57,7 +42,16 @@ folks_backend_tracker_deps = \
 	tracker-sparql-0.12 \
 	$(NULL)
 
+libfolks_tracker_la_CPPFLAGS = \
+	-I$(top_srcdir)/folks \
+	-include $(CONFIG_HEADER) \
+	-DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
+	-DBACKEND_NAME=\"$(BACKEND_NAME)\" \
+	-DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \
+	$(NULL)
+
 libfolks_tracker_la_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GEE_CFLAGS) \
@@ -65,6 +59,7 @@ libfolks_tracker_la_CFLAGS = \
 	$(NULL)
 
 libfolks_tracker_la_LIBADD = \
+	$(AM_LIBADD) \
 	$(GIO_LIBS) \
 	$(GLIB_LIBS) \
 	$(GEE_LIBS) \
@@ -76,6 +71,7 @@ libfolks_tracker_la_LIBADD = \
 # that vim quickfix mode (:make) doesn't interpret the libtool --mode=link
 # command as an error message in a bizarrely named file
 libfolks_tracker_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
 	-version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" \
 	-export-symbols-regex "^(TRF|trf)_.*|" \
 	$(NULL)
diff --git a/folks/Makefile.am b/folks/Makefile.am
index 8d6fa69..7cf909b 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -19,6 +19,7 @@ libfolks_internal_la_SOURCES = \
 	$(NULL)
 
 libfolks_internal_la_VALAFLAGS = \
+	$(AM_VALAFLAGS) \
 	$(ERROR_VALAFLAGS) \
 	--library=folks-internal \
 	--vapidir=. \
@@ -29,11 +30,17 @@ libfolks_internal_la_VALAFLAGS = \
 	$(NULL)
 
 libfolks_internal_la_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GEE_CFLAGS) \
 	$(NULL)
 
+libfolks_internal_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	$(NULL)
+
 libfolks_internal_la_LIBADD = \
+	$(AM_LIBADD) \
 	$(GLIB_LIBS) \
 	$(GEE_LIBS) \
 	$(NULL)
@@ -82,6 +89,7 @@ EDS_FLAGS = -D ENABLE_EDS
 endif
 
 libfolks_la_VALAFLAGS = \
+	$(AM_VALAFLAGS) \
 	$(ERROR_VALAFLAGS) \
 	--gir=Folks-$(API_VERSION).gir \
 	--library=folks \
@@ -100,6 +108,7 @@ libfolks_la_VALAFLAGS = \
 	$(NULL)
 
 libfolks_la_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GMODULE_CFLAGS) \
@@ -108,6 +117,7 @@ libfolks_la_CFLAGS = \
 	$(NULL)
 
 libfolks_la_LIBADD = \
+	$(AM_LIBADD) \
 	$(GIO_LIBS) \
 	$(GLIB_LIBS) \
 	$(GMODULE_LIBS) \
@@ -120,6 +130,7 @@ libfolks_la_LIBADD = \
 # that vim quickfix mode (:make) doesn't interpret the libtool --mode=link
 # command as an error message in a bizarrely named file
 libfolks_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
 	-version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)"
 
 folksdir = $(includedir)/folks
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9bcce9c..99ac032 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -10,12 +10,8 @@ if ENABLE_IMPORT_TOOL
 bin_PROGRAMS = folks-import
 endif
 
-AM_CPPFLAGS = \
-	-include $(CONFIG_HEADER) \
-	-DLOCALE_DIR=\"$(pkgdatadir)/locale\" \
-	$(NULL)
-
 VALAFLAGS = \
+	$(AM_VALAFLAGS) \
 	--vapidir=$(top_builddir)/folks \
 	--pkg=gee-1.0 \
 	--pkg=libxml-2.0 \
@@ -27,14 +23,21 @@ folks_import_SOURCES = \
 	import.vala \
 	import-pidgin.vala \
 	$(NULL)
+folks_import_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-include $(CONFIG_HEADER) \
+	-DLOCALE_DIR=\"$(pkgdatadir)/locale\" \
+	-I$(top_srcdir)/folks \
+	$(NULL)
 folks_import_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GEE_CFLAGS) \
 	$(LIBXML_CFLAGS) \
-	-I$(top_srcdir)/folks \
 	$(NULL)
 folks_import_LDADD = \
+	$(AM_LDADD) \
 	$(GIO_LIBS) \
 	$(GLIB_LIBS) \
 	$(GEE_LIBS) \
diff --git a/tools/inspect/Makefile.am b/tools/inspect/Makefile.am
index 6acfaea..62fa4a6 100644
--- a/tools/inspect/Makefile.am
+++ b/tools/inspect/Makefile.am
@@ -1,4 +1,5 @@
 VALAFLAGS = \
+	$(AM_VALAFLAGS) \
 	--vapidir=$(top_srcdir)/folks \
 	--pkg=readline \
 	--pkg=gobject-2.0 \
@@ -24,14 +25,19 @@ folks_inspect_SOURCES = \
 	inspect.vala \
 	$(NULL)
 folks_inspect_LDADD = \
+	$(AM_LDADD) \
 	$(LIBREADLINE) \
 	$(GIO_LIBS) \
 	$(GLIB_LIBS) \
 	$(GEE_LIBS) \
 	$(top_builddir)/folks/libfolks.la \
 	$(NULL)
-folks_inspect_CFLAGS = \
+folks_inspect_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
 	-I$(top_srcdir)/folks \
+	$(NULL)
+folks_inspect_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GEE_CFLAGS) \
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]