[libchamplain] Build fixes for builddir != srcdir
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libchamplain] Build fixes for builddir != srcdir
- Date: Fri, 15 Jan 2016 14:27:49 +0000 (UTC)
commit 713f73b933730d64d6e037c548cb9fbbe210d039
Author: Emmanuele Bassi <ebassi gnome org>
Date: Fri Jan 15 14:26:28 2016 +0000
Build fixes for builddir != srcdir
Generated files go in builddir, which evaluates to '.', not in srcdir.
Without this change, libchamplain fails to build in Continuous with the
following error:
make[3]: *** No rule to make target '../../champlain/champlain-enum-types.h', needed by
'Champlain-0.12.gir'. Stop.
champlain/Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index f9c2dc4..1411f6a 100644
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -110,7 +110,7 @@ include $(top_srcdir)/build/Makefile.am.marshal
# glib-mkenums rules
glib_enum_h = champlain-enum-types.h
glib_enum_c = champlain-enum-types.c
-glib_enum_headers = $(filter-out $(srcdir)/champlain-version.h,$(libchamplain_headers_public))
+glib_enum_headers = $(filter-out champlain-version.h,$(libchamplain_headers_public))
include $(top_srcdir)/build/Makefile.am.enums
libchamplain_headers_built = \
@@ -165,7 +165,7 @@ INTROSPECTION_SCANNER_ARGS = --warn-all
INTROSPECTION_COMPILER_ARGS =
introspection_sources = \
$(filter-out $(srcdir)/champlain-version.h,$(libchamplain_headers_public)) \
- $(srcdir)/champlain-enum-types.h \
+ champlain-enum-types.h \
$(libchamplain_sources)
if ENABLE_MEMPHIS
memphis_gir_include = Memphis-0.2
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]