diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-02-28 16:33:08 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-03-06 18:52:44 +0000 |
| commit | 36ed61b85c2848fbd0e056579d8164c59aa0d2d7 (patch) | |
| tree | 140a43d407dbe2b1e170e567f6cedc04df31dd97 /tools | |
| parent | 3bb3e44c673cee5b15896484e626b39c187d6750 (diff) | |
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 <folks/folks.h>,
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 <philip@tecnocode.co.uk>
[amended to do the same for tracker- and libsocialweb-specifics too -smcv]
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 1 | ||||
| -rw-r--r-- | tools/inspect/Makefile.am | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 84bcff72..4e242722 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 577e2309..b62af9a3 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 = \ |