diff options
author | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2011-12-08 18:26:53 -0500 |
---|---|---|
committer | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2011-12-08 18:26:53 -0500 |
commit | fb24a81c329bcdbb3766ccff982f02241e2ffd3a (patch) | |
tree | 32b71aa894c3fa0bc23b48202660c38ac11d09c6 | |
parent | a829144960de949e7601250a585ee38128f1231b (diff) | |
download | telepathy-farstream-fb24a81c329bcdbb3766ccff982f02241e2ffd3a.tar.gz |
Fix build with installed incompatible version
-rw-r--r-- | examples/Makefile.am | 6 | ||||
-rw-r--r-- | telepathy-farstream/Makefile.am | 6 | ||||
-rw-r--r-- | telepathy-farstream/telepathy-farstream.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am index ff2e7c3..b7e60a7 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -10,11 +10,11 @@ LDADD = \ $(TELEPATHY_LIBS) AM_CFLAGS = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ $(ERROR_CFLAGS) \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(GST_CFLAGS) \ $(FARSTREAM_CFLAGS) \ - $(TELEPATHY_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_builddir) + $(TELEPATHY_CFLAGS) diff --git a/telepathy-farstream/Makefile.am b/telepathy-farstream/Makefile.am index 04f3c68..723fa4b 100644 --- a/telepathy-farstream/Makefile.am +++ b/telepathy-farstream/Makefile.am @@ -45,15 +45,15 @@ pkgconfigdir = ${libdir}/pkgconfig pkgconfig_DATA = telepathy-farstream.pc AM_CFLAGS = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ -DG_LOG_DOMAIN=\"tp-fs\" \ $(ERROR_CFLAGS) \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(GST_CFLAGS) \ $(FARSTREAM_CFLAGS) \ - $(TELEPATHY_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_builddir) + $(TELEPATHY_CFLAGS) libtelepathy_farstream_la_LIBADD = \ $(GLIB_LIBS) \ diff --git a/telepathy-farstream/telepathy-farstream.c b/telepathy-farstream/telepathy-farstream.c index 85d16a1..afc2762 100644 --- a/telepathy-farstream/telepathy-farstream.c +++ b/telepathy-farstream/telepathy-farstream.c @@ -18,7 +18,7 @@ */ #include "extensions/extensions.h" -#include <telepathy-farstream/telepathy-farstream.h> +#include "telepathy-farstream.h" /** * tf_init: |