[gnome-builder] build: include libide srcdir for Ide-1.0.gir



commit d074827dc42716defbfa154bb6ce8157642dff24
Author: Christian Hergert <christian hergert me>
Date:   Sun Sep 6 14:12:36 2015 -0700

    build: include libide srcdir for Ide-1.0.gir
    
    We use srcdir because we are either:
    
     - in tree build, in which case srcdir == builddir
     - out of tree, in which case Ide-1.0.gir is bundled source

 libide/Makefile.am |    2 +-
 src/Makefile.am    |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/libide/Makefile.am b/libide/Makefile.am
index f330fe0..28fe6a5 100644
--- a/libide/Makefile.am
+++ b/libide/Makefile.am
@@ -374,7 +374,7 @@ Ide_1_0_gir_SCANNERFLAGS = \
 INTROSPECTION_GIRS += Ide-1.0.gir
 
 girdir = $(datadir)/gir-1.0
-gir_DATA = $(INTROSPECTION_GIRS)
+dist_gir_DATA = $(INTROSPECTION_GIRS)
 
 typelibdir = $(pkglibdir)/girepository-1.0
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
diff --git a/src/Makefile.am b/src/Makefile.am
index 145780b..e6140b8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -277,7 +277,9 @@ include $(top_srcdir)/build/autotools/Makefile.am.gresources
 
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+INTROSPECTION_COMPILER_ARGS = \
+       --includedir=$(srcdir) \
+       --includedir=$(top_srcdir)/libide
 
 if HAVE_INTROSPECTION
 introspection_sources = \
@@ -307,5 +309,6 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 CLEANFILES += $(gir_DATA) $(typelib_DATA)
 endif
 
+GITIGNOREFILES = Builder-1.0.gir
 
 -include $(top_srcdir)/git.mk


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]