Attachment 38226 Details for Bug 29842 – Fix out-of-tree compilation

[patch] Fix out-of-tree compilation

out-of-tree.patch (text/plain), 1.40 KB, created by Nicolas Dufresne on 2010-08-27 09:26:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolas Dufresne

Created: 2010-08-27 09:26:31 UTC

Size: 1.40 KB

patch

obsolete

>commit 48eebc053edd754a5b601e1993b497ad1912438b
>Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
>Date:   Fri Aug 27 12:03:16 2010 -0400
>
>    Fixed out-of-tree compilation
>    
>    Fixe path to config.status from srcdir to builddir and Added missing
>    -I $(top_builddir)/extensions.
>
>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\"			\

Actions: View | Splinter Review

Attachments on bug 29842: 38226

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.