[gnome-builder/gnome-builder-3-18] build: fix distcheck

[Christian Hergert <chergert src gnome org>]

commit 25387662c9c9efb5c681293b3fa44b2be6ba2d19
Author: Christian Hergert <chergert redhat com>
Date:   Thu Oct 15 07:23:37 2015 -0700

    build: fix distcheck

 contrib/egg/Makefile.am         |    4 ++--
 libide/Makefile.am              |    3 ++-
 plugins/clang/Makefile.am       |    1 +
 src/Makefile.am                 |   15 ++++++++-------
 src/views/gb-view-stack-split.h |    2 --
 5 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/contrib/egg/Makefile.am b/contrib/egg/Makefile.am
index f2b9ed4..3c0f260 100644
--- a/contrib/egg/Makefile.am
+++ b/contrib/egg/Makefile.am
@@ -106,10 +106,10 @@ egg_private_vapi_FILES = Egg-1.0.gir
 egg-private.deps: Makefile
        $(AM_V_GEN) echo $(libegg_private_vapi_DEPS) | tr ' ' '\n' > $@
 
-vapidir = $(VAPIGEN_VAPIDIR)
+vapidir = $(datadir)/gnome-builder/vapi
 vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
 
-EXTRA_DIST += libegg-private.deps
+EXTRA_DIST += egg-private.deps
 
 DISTCLEANFILES += $(vapi_DATA)
 endif
diff --git a/libide/Makefile.am b/libide/Makefile.am
index ebb8b71..45b092c 100644
--- a/libide/Makefile.am
+++ b/libide/Makefile.am
@@ -240,6 +240,7 @@ libide_1_0_la_SOURCES = \
        util/ide-gdk.h \
        util/ide-line-reader.c \
        util/ide-line-reader.h \
+       util/ide-list-inline.h \
        util/ide-pango.c \
        util/ide-pango.h \
        util/ide-rgba.c \
@@ -409,7 +410,7 @@ libide_1_0_vapi_FILES = Ide-1.0.gir
 libide-1.0.deps: Makefile
        $(AM_V_GEN) echo $(libide_1_0_vapi_DEPS) | tr ' ' '\n' > $@
 
-vapidir = $(VAPIGEN_VAPIDIR)
+vapidir = $(datadir)/gnome-builder/vapi
 vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
 
 EXTRA_DIST += libide-1.0.deps
diff --git a/plugins/clang/Makefile.am b/plugins/clang/Makefile.am
index d375c6c..7696ba1 100644
--- a/plugins/clang/Makefile.am
+++ b/plugins/clang/Makefile.am
@@ -9,6 +9,7 @@ dist_plugin_DATA = clang.plugin
 libclang_plugin_la_SOURCES = \
        ide-clang-completion-item.c \
        ide-clang-completion-item.h \
+       ide-clang-completion-item-private.h \
        ide-clang-completion-provider.c \
        ide-clang-completion-provider.h \
        ide-clang-diagnostic-provider.c \
diff --git a/src/Makefile.am b/src/Makefile.am
index 264712d..c3bb3d5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,10 +34,13 @@ libgnome_builder_public_sources = \
        views/gb-view.h \
        views/gb-view-stack.c \
        views/gb-view-stack.h \
+       views/gb-view-stack-split.h \
        views/gb-view-grid.c \
        views/gb-view-grid.h \
        workbench/gb-workbench.c \
        workbench/gb-workbench.h \
+       gb-enums.c \
+       gb-enums.h \
        $(NULL)
 
 libgnome_builder_la_SOURCES = \
@@ -187,8 +190,6 @@ libgnome_builder_la_SOURCES = \
        css/gb-css-provider.h \
        util/gb-settings.c \
        util/gb-settings.h \
-       gb-enums.c \
-       gb-enums.h \
        $(NULL)
 
 glib_enum_h = gb-enums.h
@@ -293,9 +294,7 @@ if HAVE_INTROSPECTION
 
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
-INTROSPECTION_COMPILER_ARGS = \
-       --includedir=$(srcdir) \
-       --includedir=$(top_srcdir)/libide
+INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libide
 
 introspection_sources = \
        $(libgnome_builder_public_sources) \
@@ -340,12 +339,14 @@ gnome_builder_1_0_vapi_DEPS = libide-1.0 gio-2.0 gtk+-3.0 gtksourceview-3.0
 gnome_builder_1_0_vapi_VAPIDIRS = $(top_builddir)/libide
 gnome_builder_1_0_vapi_METADATADIRS = $(srcdir)
 gnome_builder_1_0_vapi_FILES = Builder-1.0.gir
-gnome_builder_1_0_vapi_GIRDIRS = $(top_builddir)/libide
+gnome_builder_1_0_vapi_GIRDIRS = \
+       $(top_builddir)/libide \
+       $(top_srcdir)/libide
 
 gnome-builder-1.0.deps: Makefile
        $(AM_V_GEN) echo $(gnome_builder_1_0_vapi_DEPS) | tr ' ' '\n' > $@
 
-vapidir = $(VAPIGEN_VAPIDIR)
+vapidir = $(datadir)/gnome-builder/vapi
 vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
 
 EXTRA_DIST += gnome-builder-1.0.deps
diff --git a/src/views/gb-view-stack-split.h b/src/views/gb-view-stack-split.h
index e4bae37..d2d5e65 100644
--- a/src/views/gb-view-stack-split.h
+++ b/src/views/gb-view-stack-split.h
@@ -39,8 +39,6 @@ typedef enum
   GB_VIEW_GRID_SPLIT_MOVE_RIGHT = 4,
 } GbViewGridSplit;
 
-GType gb_view_stack_split_get_type (void);
-
 G_END_DECLS
 
 #endif /* GB_VIEW_STACK_SPLIT_H */