[libgda] Fix non-srcdir builds for introspection
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Fix non-srcdir builds for introspection
- Date: Sun, 26 Mar 2017 11:03:35 +0000 (UTC)
commit d95b0e84a7ec5f094cfa706f69d0fe3824dc9f01
Author: Emmanuele Bassi <ebassi gnome org>
Date: Sun Mar 26 11:58:23 2017 +0100
Fix non-srcdir builds for introspection
The inclusion paths must include the build directory, and we should not
prefix `$(srcdir)` to generated files, because they are definitely not
in the source directory.
libgda/Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index 103ba49..6c915fc 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -31,6 +31,7 @@ GLOBAL_CFLAGS = \
-I$(top_srcdir)/libgda/sqlite \
-I$(top_srcdir)/libgda \
-I$(top_builddir)/libgda/sqlite \
+ -I$(top_builddir)/libgda \
-DABI_VERSION=\""$(GDA_ABI_VERSION)"\" \
$(COREDEPS_CFLAGS) \
$(BDB_CFLAGS) \
@@ -341,7 +342,6 @@ handlers = \
handlers/gda-handler-type.c
introspection_sources = $(gda_sources) \
- $(gda_built_sources) \
$(gda_headers) \
$(psupport) \
$(threadwrapper) \
@@ -352,7 +352,7 @@ Gda_6_0_gir_INCLUDES = GObject-2.0 libxml2-2.0
Gda_6_0_gir_CFLAGS = $(GLOBAL_CFLAGS)
Gda_6_0_gir_LIBS = $(lib_LTLIBRARIES)
-Gda_6_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
+Gda_6_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources)) $(gda_built_sources)
INTROSPECTION_GIRS += Gda-6.0.gir
if ENABLE_GI_SYSTEM_INSTALL
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]