From 36ed61b85c2848fbd0e056579d8164c59aa0d2d7 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 28 Feb 2013 16:33:08 +0000 Subject: [PATCH] Add -I$(top_srcdir) throughout Automake adds (the equivalent of) -I$(top_builddir) to our CPPFLAGS automatically, so we can #include "config.h". It does not add -I$(top_srcdir). Many things in folks want to #include , so we should always have -I$(top_srcdir) so we can pick that up. Out-of-tree builds previously either didn't work, or relied on having installed folks headers (I'm not sure which). Bug: https://bugzilla.gnome.org/show_bug.cgi?id=694883 Reviewed-by: Philip Withnall [amended to do the same for tracker- and libsocialweb-specifics too -smcv] Signed-off-by: Simon McVittie --- backends/eds/Makefile.am | 1 + backends/eds/lib/Makefile.am | 1 + backends/key-file/Makefile.am | 1 + backends/libsocialweb/Makefile.am | 1 + backends/libsocialweb/lib/Makefile.am | 1 + backends/ofono/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 + 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/tracker/Makefile.am | 1 + tests/libsocialweb/Makefile.am | 1 + tests/telepathy/Makefile.am | 1 + tests/tracker/Makefile.am | 1 + tools/Makefile.am | 1 + tools/inspect/Makefile.am | 1 + 21 files changed, 21 insertions(+) diff --git a/backends/eds/Makefile.am b/backends/eds/Makefile.am index ca36417..3aea5f2 100644 --- a/backends/eds/Makefile.am +++ b/backends/eds/Makefile.am @@ -32,6 +32,7 @@ eds_deps = \ $(NULL) eds_la_CPPFLAGS = \ + -I$(top_srcdir) \ -I$(top_srcdir)/folks \ -I$(top_srcdir)/backends/eds/lib \ -I$(top_srcdir)/backends/eds/lib/folks \ diff --git a/backends/eds/lib/Makefile.am b/backends/eds/lib/Makefile.am index a0dddb0..83d5ae4 100644 --- a/backends/eds/lib/Makefile.am +++ b/backends/eds/lib/Makefile.am @@ -1,6 +1,7 @@ BACKEND_NAME = "eds" AM_CPPFLAGS = \ + -I$(top_srcdir) \ -I$(top_srcdir)/folks \ -include $(CONFIG_HEADER) \ -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ diff --git a/backends/key-file/Makefile.am b/backends/key-file/Makefile.am index f9a1a7f..ffc25cd 100644 --- a/backends/key-file/Makefile.am +++ b/backends/key-file/Makefile.am @@ -23,6 +23,7 @@ key_file_la_VALAFLAGS = \ $(NULL) key_file_la_CPPFLAGS = \ + -I$(top_srcdir) \ -I$(top_srcdir)/folks \ -include $(CONFIG_HEADER) \ -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ diff --git a/backends/libsocialweb/Makefile.am b/backends/libsocialweb/Makefile.am index 7cb5d8f..bf763be 100644 --- a/backends/libsocialweb/Makefile.am +++ b/backends/libsocialweb/Makefile.am @@ -30,6 +30,7 @@ libsocialweb_deps = \ $(NULL) libsocialweb_la_CPPFLAGS = \ + -I$(top_srcdir) \ -I$(top_srcdir)/folks \ -I$(top_srcdir)/backends/libsocialweb/lib \ -I$(top_srcdir)/backends/libsocialweb/lib/folks \ diff --git a/backends/libsocialweb/lib/Makefile.am b/backends/libsocialweb/lib/Makefile.am index b8db152..618c8cb 100644 --- a/backends/libsocialweb/lib/Makefile.am +++ b/backends/libsocialweb/lib/Makefile.am @@ -1,6 +1,7 @@ BACKEND_NAME = "libsocialweb" AM_CPPFLAGS = \ + -I$(top_srcdir) \ -I$(top_srcdir)/folks \ -include $(CONFIG_HEADER) \ -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ diff --git a/backends/ofono/Makefile.am b/backends/ofono/Makefile.am index 15e380b..651a964 100644 --- a/backends/ofono/Makefile.am +++ b/backends/ofono/Makefile.am @@ -30,6 +30,7 @@ ofono_la_VALAFLAGS = \ # in libebook-1.2.deps. ofono_la_CPPFLAGS = \ + -I$(top_srcdir) \ -I$(top_srcdir)/folks \ -include $(CONFIG_HEADER) \ -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ diff --git a/backends/telepathy/Makefile.am b/backends/telepathy/Makefile.am index 83d5b88..0faf26a 100644 --- a/backends/telepathy/Makefile.am +++ b/backends/telepathy/Makefile.am @@ -30,6 +30,7 @@ telepathy_deps = \ $(NULL) telepathy_la_CPPFLAGS = \ + -I$(top_srcdir) \ -I$(top_srcdir)/folks \ -I$(top_srcdir)/backends/telepathy/lib \ -I$(top_srcdir)/backends/telepathy/lib/folks \ diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am index f286252..34f3187 100644 --- a/backends/telepathy/lib/Makefile.am +++ b/backends/telepathy/lib/Makefile.am @@ -1,6 +1,7 @@ BACKEND_NAME = "telepathy" AM_CPPFLAGS = \ + -I$(top_srcdir) \ -I$(top_srcdir)/folks \ -include $(CONFIG_HEADER) \ -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ diff --git a/backends/tracker/Makefile.am b/backends/tracker/Makefile.am index 73dc099..ac3ce9a 100644 --- a/backends/tracker/Makefile.am +++ b/backends/tracker/Makefile.am @@ -31,6 +31,7 @@ tracker_deps = \ $(NULL) tracker_la_CPPFLAGS = \ + -I$(top_srcdir) \ -I$(top_srcdir)/folks \ -I$(top_srcdir)/backends/tracker/lib \ -I$(top_srcdir)/backends/tracker/lib/folks \ diff --git a/backends/tracker/lib/Makefile.am b/backends/tracker/lib/Makefile.am index 3c16a8d..3188970 100644 --- a/backends/tracker/lib/Makefile.am +++ b/backends/tracker/lib/Makefile.am @@ -44,6 +44,7 @@ folks_backend_tracker_deps = \ $(NULL) libfolks_tracker_la_CPPFLAGS = \ + -I$(top_srcdir) \ -I$(top_srcdir)/folks \ -include $(CONFIG_HEADER) \ -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ diff --git a/tests/eds/Makefile.am b/tests/eds/Makefile.am index a99f4d5..c4bd1a1 100644 --- a/tests/eds/Makefile.am +++ b/tests/eds/Makefile.am @@ -3,6 +3,7 @@ AM_CPPFLAGS = \ $(GEE_CFLAGS) \ $(EBOOK_CFLAGS) \ $(EDATASERVER_CFLAGS) \ + -I$(top_srcdir) \ -I$(top_srcdir)/folks \ -I$(top_srcdir)/backends/eds/lib \ -I$(top_srcdir)/backends/eds/lib/folks \ diff --git a/tests/folks/Makefile.am b/tests/folks/Makefile.am index 470485e..4239e28 100644 --- a/tests/folks/Makefile.am +++ b/tests/folks/Makefile.am @@ -2,6 +2,7 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ $(TP_GLIB_CFLAGS) \ + -I$(top_srcdir) \ -I$(top_srcdir)/folks \ -I$(top_srcdir)/tests/lib \ -I$(top_srcdir)/tests/lib/key-file \ diff --git a/tests/key-file/Makefile.am b/tests/key-file/Makefile.am index a2a1e7f..bc2e83a 100644 --- a/tests/key-file/Makefile.am +++ b/tests/key-file/Makefile.am @@ -1,6 +1,7 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ + -I$(top_srcdir) \ -I$(top_srcdir)/folks \ -I$(top_srcdir)/tests/lib \ -I$(top_srcdir)/tests/lib/key-file \ diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index 1d5c8c0..9c55831 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -39,6 +39,7 @@ libfolks_test_la_CFLAGS = \ libfolks_test_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ + -I$(top_srcdir) \ -I$(top_srcdir)/folks \ $(NULL) diff --git a/tests/lib/eds/Makefile.am b/tests/lib/eds/Makefile.am index 304629a..dfa5238 100644 --- a/tests/lib/eds/Makefile.am +++ b/tests/lib/eds/Makefile.am @@ -28,6 +28,7 @@ libeds_test_la_CFLAGS = \ $(GEE_CFLAGS) \ $(EBOOK_CFLAGS) \ $(EDATASERVER_CFLAGS) \ + -I$(top_srcdir) \ -I$(top_srcdir)/folks \ -I$(top_srcdir)/backends/eds/lib \ -I$(top_srcdir)/backends/eds/lib/folks \ diff --git a/tests/lib/tracker/Makefile.am b/tests/lib/tracker/Makefile.am index f0d2524..a7d07b8 100644 --- a/tests/lib/tracker/Makefile.am +++ b/tests/lib/tracker/Makefile.am @@ -24,6 +24,7 @@ libtracker_test_la_CFLAGS = \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ $(TRACKER_SPARQL_CFLAGS) \ + -I$(top_srcdir) \ -I$(top_srcdir)/folks \ -I$(top_srcdir)/backends/tracker/lib \ -I$(top_srcdir)/backends/tracker/lib/folks \ diff --git a/tests/libsocialweb/Makefile.am b/tests/libsocialweb/Makefile.am index 3af489e..ec7da62 100644 --- a/tests/libsocialweb/Makefile.am +++ b/tests/libsocialweb/Makefile.am @@ -3,6 +3,7 @@ AM_CPPFLAGS = \ $(GIO_CFLAGS) \ $(GEE_CFLAGS) \ $(SW_CLIENT_CFLAGS) \ + -I$(top_srcdir) \ -I$(top_srcdir)/folks \ -I$(top_srcdir)/backends/libsocialweb/lib \ -I$(top_srcdir)/backends/libsocialweb/lib/folks \ diff --git a/tests/telepathy/Makefile.am b/tests/telepathy/Makefile.am index 67086fe..eb5a7a1 100644 --- a/tests/telepathy/Makefile.am +++ b/tests/telepathy/Makefile.am @@ -2,6 +2,7 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ $(TP_GLIB_CFLAGS) \ + -I$(top_srcdir) \ -I$(top_srcdir)/folks \ -I$(top_srcdir)/backends/telepathy \ -I$(top_srcdir)/backends/telepathy/lib \ diff --git a/tests/tracker/Makefile.am b/tests/tracker/Makefile.am index fe88726..711fe6c 100644 --- a/tests/tracker/Makefile.am +++ b/tests/tracker/Makefile.am @@ -2,6 +2,7 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ $(TRACKER_SPARQL_CFLAGS) \ + -I$(top_srcdir) \ -I$(top_srcdir)/folks \ -I$(top_srcdir)/backends/tracker/lib \ -I$(top_srcdir)/backends/tracker/lib/folks \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 84bcff7..4e24272 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -27,6 +27,7 @@ folks_import_CPPFLAGS = \ $(AM_CPPFLAGS) \ -include $(CONFIG_HEADER) \ -DLOCALE_DIR=\"$(pkgdatadir)/locale\" \ + -I$(top_srcdir) \ -I$(top_srcdir)/folks \ $(NULL) folks_import_CFLAGS = \ diff --git a/tools/inspect/Makefile.am b/tools/inspect/Makefile.am index 577e230..b62af9a 100644 --- a/tools/inspect/Makefile.am +++ b/tools/inspect/Makefile.am @@ -40,6 +40,7 @@ folks_inspect_CPPFLAGS = \ $(AM_CPPFLAGS) \ -include $(CONFIG_HEADER) \ -DLOCALE_DIR=\"$(pkgdatadir)/locale\" \ + -I$(top_srcdir) \ -I$(top_srcdir)/folks \ $(NULL) folks_inspect_CFLAGS = \ -- 2.7.4