summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Dufresne <nicolas.dufresne@collabora.co.uk>2010-08-27 12:03:16 -0400
committerNicolas Dufresne <nicolas.dufresne@collabora.co.uk>2010-08-27 12:23:29 -0400
commit48eebc053edd754a5b601e1993b497ad1912438b (patch)
tree0f52fd48de2b60a68d2280bb60f30277d3eab3c5
parent4760b61dcce9869c6371d56519248a0aef91c0a9 (diff)
downloadtelepathy-logger-48eebc053edd754a5b601e1993b497ad1912438b.tar.gz
Fixed out-of-tree compilation
Fixe path to config.status from srcdir to builddir and Added missing -I $(top_builddir)/extensions.
-rw-r--r--extensions/Makefile.am2
-rw-r--r--src/Makefile.am1
-rw-r--r--telepathy-logger/Makefile.am1
3 files changed, 3 insertions, 1 deletions
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 75d68ac..6c82fbe 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -7,7 +7,7 @@ if ENABLE_PUBLIC_EXTENSIONS
pkgconfig_DATA += tpl-extensions.pc
endif # ENABLE_PUBLIC_EXTENSIONS
-$(pkgconfig_DATA): $(top_srcdir)/config.status
+$(pkgconfig_DATA): $(top_builddir)/config.status
EXTRA_DIST = \
all.xml \
diff --git a/src/Makefile.am b/src/Makefile.am
index 4e0ca5c..7e33e3b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,7 @@ include $(top_srcdir)/tools/flymake.mk
AM_CPPFLAGS = \
-I$(top_builddir) \
+ -I$(top_builddir)/extensions \
-I$(top_srcdir) \
$(ERROR_CFLAGS) \
-DG_LOG_DOMAIN=\"tp-logger\" \
diff --git a/telepathy-logger/Makefile.am b/telepathy-logger/Makefile.am
index 2e4a9ae..38c75a2 100644
--- a/telepathy-logger/Makefile.am
+++ b/telepathy-logger/Makefile.am
@@ -2,6 +2,7 @@ include $(top_srcdir)/tools/flymake.mk
AM_CPPFLAGS = \
-I$(top_builddir) \
+ -I$(top_builddir)/extensions \
-I$(top_srcdir) \
$(ERROR_CFLAGS) \
-DG_LOG_DOMAIN=\"tp-logger\" \