[gnome-builder] build: fix building external modules

[Christian Hergert <chergert src gnome org>]

commit 62c30a75479e766fe6bff085ece4b4e6d191a2f2
Author: Christian Hergert <chergert redhat com>
Date:   Mon Nov 6 13:09:14 2017 -0800

    build: fix building external modules
    
    This fixes a series of typos and broken assumptions from the
    recent build system cleanup. You can now build against libide
    externally and expect it to succeed.

 src/libide/documentation/meson.build |    2 +-
 src/libide/files/meson.build         |    1 +
 src/libide/formatting/meson.build    |    2 +-
 src/libide/highlighting/meson.build  |    2 +-
 src/libide/ide.h                     |    1 -
 src/libide/meson.build               |    6 ++++--
 src/libide/runtimes/meson.build      |    2 +-
 src/libide/util/meson.build          |    4 ++--
 8 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/src/libide/documentation/meson.build b/src/libide/documentation/meson.build
index 6abd87f..8456468 100644
--- a/src/libide/documentation/meson.build
+++ b/src/libide/documentation/meson.build
@@ -15,4 +15,4 @@ directory_sources = [
 libide_public_headers += files(directory_headers)
 libide_public_sources += files(directory_sources)
 
-install_headers(directory_headers, subdir: join_paths(libide_header_subdir, 'directory'))
+install_headers(directory_headers, subdir: join_paths(libide_header_subdir, 'documentation'))
diff --git a/src/libide/files/meson.build b/src/libide/files/meson.build
index c14ec13..0d8558e 100644
--- a/src/libide/files/meson.build
+++ b/src/libide/files/meson.build
@@ -1,6 +1,7 @@
 files_headers = [
   'ide-file.h',
   'ide-file-settings.h',
+  'ide-file-settings.defs',
   'ide-indent-style.h',
 ]
 
diff --git a/src/libide/formatting/meson.build b/src/libide/formatting/meson.build
index 40fbd1b..55f123a 100644
--- a/src/libide/formatting/meson.build
+++ b/src/libide/formatting/meson.build
@@ -11,4 +11,4 @@ formatting_sources = [
 libide_public_headers += files(formatting_headers)
 libide_public_sources += files(formatting_sources)
 
-install_headers(formatting_headers, subdir: libide_header_subdir)
+install_headers(formatting_headers, subdir: join_paths(libide_header_subdir, 'formatting'))
diff --git a/src/libide/highlighting/meson.build b/src/libide/highlighting/meson.build
index 13b3866..3fe0813 100644
--- a/src/libide/highlighting/meson.build
+++ b/src/libide/highlighting/meson.build
@@ -18,4 +18,4 @@ libide_public_headers += files(highlighting_headers)
 libide_public_sources += files(highlighting_sources)
 libide_enum_headers += files(highlighting_enums)
 
-install_headers(highlighting_headers, subdir: join_paths(libide_header_subdir, 'genesis'))
+install_headers(highlighting_headers, subdir: join_paths(libide_header_subdir, 'highlighting'))
diff --git a/src/libide/ide.h b/src/libide/ide.h
index 61e2023..e0bf6e4 100644
--- a/src/libide/ide.h
+++ b/src/libide/ide.h
@@ -150,7 +150,6 @@ G_BEGIN_DECLS
 #include "sourceview/ide-completion-item.h"
 #include "sourceview/ide-completion-provider.h"
 #include "sourceview/ide-completion-results.h"
-#include "sourceview/ide-completion-words.h"
 #include "sourceview/ide-indenter.h"
 #include "sourceview/ide-language.h"
 #include "sourceview/ide-source-map.h"
diff --git a/src/libide/meson.build b/src/libide/meson.build
index 7f3ad79..ff77c83 100644
--- a/src/libide/meson.build
+++ b/src/libide/meson.build
@@ -40,6 +40,7 @@ libide_public_headers += [
   'ide-pausable.h',
   'ide-service.h',
   'ide-types.h',
+  'ide-version-macros.h',
 ]
 
 libide_public_sources += [
@@ -125,6 +126,7 @@ install_headers([
   'ide-pausable.h',
   'ide-service.h',
   'ide-types.h',
+  'ide-version-macros.h',
 ], subdir: libide_header_subdir)
 
 libide_resources = gnome.compile_resources('ide-resources',
@@ -264,12 +266,12 @@ pkgg = import('pkgconfig')
 
 pkgg.generate(
     libraries: [libide],
-      subdirs: [ 'gnome-builder-@0@/libide'.format(meson.project_version()) ],
+      subdirs: [ 'gnome-builder/libide' ],
       version: meson.project_version(),
          name: 'Libide',
      filebase: 'libide-1.0',
   description: 'Libide contains the components used to build the GNOME Builder IDE.',
-     requires: [ 'gtk+-3.0', 'gtksourceview-3.0', 'libdazzle-1.0', 'template-glib-1.0', 'jsonrpc-glib-1.0' ],
+     requires: [ 'gtk+-3.0', 'gtksourceview-3.0', 'libdazzle-1.0', 'template-glib-1.0', 'jsonrpc-glib-1.0', 
'libpeas-1.0' ],
   install_dir: join_paths(pkglibdir, 'pkgconfig'),
 )
 
diff --git a/src/libide/runtimes/meson.build b/src/libide/runtimes/meson.build
index 3e2f7df..47570ec 100644
--- a/src/libide/runtimes/meson.build
+++ b/src/libide/runtimes/meson.build
@@ -18,4 +18,4 @@ libide_public_headers += files(runtimes_headers)
 libide_public_sources += files(runtimes_sources)
 libide_enum_headers += files(runtimes_enums)
 
-install_headers(runtimes_headers, subdir: join_paths(libide_header_subdir, 'runtime'))
+install_headers(runtimes_headers, subdir: join_paths(libide_header_subdir, 'runtimes'))
diff --git a/src/libide/util/meson.build b/src/libide/util/meson.build
index fa1d56c..0c67cae 100644
--- a/src/libide/util/meson.build
+++ b/src/libide/util/meson.build
@@ -8,6 +8,7 @@ util_headers = [
   'ide-list-inline.h',
   'ide-posix.h',
   'ide-progress.h',
+  'ide-ref-ptr.h',
   'ide-settings.h',
   'ide-uri.h',
 ]
@@ -21,6 +22,7 @@ util_sources = [
   'ide-line-reader.c',
   'ide-posix.c',
   'ide-progress.c',
+  'ide-ref-ptr.c',
   'ide-settings.c',
   'ide-uri.c',
 ]
@@ -32,8 +34,6 @@ util_private_sources = [
   'ide-battery-monitor.h',
   'ide-doc-seq.c',
   'ide-doc-seq.h',
-  'ide-ref-ptr.c',
-  'ide-ref-ptr.h',
   'ide-window-settings.c',
   'ide-window-settings.h',
 ]