[gnome-builder] build: install headers to $(includedir)/gnome-builder- VERSION@
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] build: install headers to $(includedir)/gnome-builder- VERSION@
- Date: Sun, 21 Feb 2016 22:17:02 +0000 (UTC)
commit b9814cd9c802e39c3976a5585e08304ae27ebfc6
Author: Christian Hergert <christian hergert me>
Date: Sun Feb 21 13:44:41 2016 -0800
build: install headers to $(includedir)/gnome-builder- VERSION@
To build vala and C plugins out of tree, we need to install the headers.
These are all private API still, and subject to change, so we will install
to a versioned directory based on the GNOME Builder release.
Use pkg-config to get the includes for the version you are using, such as
`pkg-config --cflags --libs libide-1.0`
One might argue that we should drop the -1.0 for libide until we reach
some sort of ABI stability…
contrib/egg/Makefile.am | 74 ++++------
contrib/tmpl/Makefile.am | 5 +-
data/libide-1.0.pc.in | 6 +-
libide/Makefile.am | 330 +++++++++++++++++++++++-----------------------
4 files changed, 204 insertions(+), 211 deletions(-)
---
diff --git a/contrib/egg/Makefile.am b/contrib/egg/Makefile.am
index 1da18c9..06f1bdf 100644
--- a/contrib/egg/Makefile.am
+++ b/contrib/egg/Makefile.am
@@ -6,54 +6,59 @@ BUILT_SOURCES =
pkglibdir = $(libdir)/gnome-builder
pkglib_LTLIBRARIES = libegg-private.la
-libegg_private_la_SOURCES = \
- egg-animation.c \
+headersdir = $(includedir)/gnome-builder- VERSION@/egg
+headers_DATA = \
egg-animation.h \
- egg-binding-group.c \
egg-binding-group.h \
- egg-box.c \
egg-box.h \
- egg-centering-bin.c \
egg-centering-bin.h \
- egg-column-layout.c \
egg-column-layout.h \
- egg-counter.c \
egg-counter.h \
- egg-date-time.c \
egg-date-time.h \
- egg-frame-source.c \
egg-frame-source.h \
- egg-heap.c \
egg-heap.h \
- egg-menu-manager.c \
egg-menu-manager.h \
- egg-pill-box.c \
egg-pill-box.h \
egg-private.h \
- egg-scrolled-window.c \
egg-scrolled-window.h \
- egg-search-bar.c \
egg-search-bar.h \
- egg-settings-flag-action.c \
egg-settings-flag-action.h \
- egg-settings-sandwich.c \
egg-settings-sandwich.h \
- egg-signal-group.c \
egg-signal-group.h \
- egg-simple-popover.c \
egg-simple-popover.h \
- egg-slider.c \
egg-slider.h \
- egg-state-machine.c \
+ egg-state-machine-action.h \
+ egg-state-machine-buildable.h \
egg-state-machine.h \
+ egg-task-cache.h \
+ egg-widget-action-group.h \
+ $(NULL)
+
+libegg_private_la_SOURCES = \
+ $(headers_DATA) \
+ egg-animation.c \
+ egg-binding-group.c \
+ egg-box.c \
+ egg-centering-bin.c \
+ egg-column-layout.c \
+ egg-counter.c \
+ egg-date-time.c \
+ egg-frame-source.c \
+ egg-heap.c \
+ egg-menu-manager.c \
+ egg-pill-box.c \
+ egg-scrolled-window.c \
+ egg-search-bar.c \
+ egg-settings-flag-action.c \
+ egg-settings-sandwich.c \
+ egg-signal-group.c \
+ egg-simple-popover.c \
+ egg-slider.c \
egg-state-machine-action.c \
- egg-state-machine-action.h \
egg-state-machine-buildable.c \
- egg-state-machine-buildable.h \
+ egg-state-machine.c \
egg-task-cache.c \
- egg-task-cache.h \
egg-widget-action-group.c \
- egg-widget-action-group.h \
$(NULL)
nodist_libegg_private_la_SOURCES = \
@@ -84,30 +89,11 @@ INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
-introspection_sources = \
- egg-animation.c \
- egg-animation.h \
- egg-binding-group.c \
- egg-binding-group.h \
- egg-search-bar.c \
- egg-search-bar.h \
- egg-settings-flag-action.c \
- egg-settings-flag-action.h \
- egg-settings-sandwich.c \
- egg-settings-sandwich.h \
- egg-signal-group.c \
- egg-signal-group.h \
- egg-state-machine.c \
- egg-state-machine.h \
- egg-task-cache.c \
- egg-task-cache.h \
- $(NULL)
-
Egg-1.0.gir: libegg-private.la
Egg_1_0_gir_INCLUDES = Gio-2.0 Gdk-3.0 Gtk-3.0
Egg_1_0_gir_CFLAGS = $(libegg_private_la_CFLAGS)
Egg_1_0_gir_LIBS = libegg-private.la
-Egg_1_0_gir_FILES = $(introspection_sources)
+Egg_1_0_gir_FILES = $(libegg_private_la_SOURCES)
Egg_1_0_gir_SCANNERFLAGS = \
--c-include="egg-private.h" \
-n Egg \
diff --git a/contrib/tmpl/Makefile.am b/contrib/tmpl/Makefile.am
index 78acf39..70afec9 100644
--- a/contrib/tmpl/Makefile.am
+++ b/contrib/tmpl/Makefile.am
@@ -12,9 +12,10 @@ EXTRA_DIST = \
tmpl-expr-parser.c \
tmpl-expr-parser.h \
tmpl-expr-scanner.c \
- tmpl-expr-scanner.h
+ tmpl-expr-scanner.h \
+ $(NULL)
-pkgincludedir = $(includedir)/template-glib-1.0
+pkgincludedir = $(includedir)/gnome-builder- VERSION@/template-glib
pkginclude_HEADERS = \
tmpl-error.h \
tmpl-expr-types.h \
diff --git a/data/libide-1.0.pc.in b/data/libide-1.0.pc.in
index e0b5afc..0917ffc 100644
--- a/data/libide-1.0.pc.in
+++ b/data/libide-1.0.pc.in
@@ -4,8 +4,8 @@ libdir=${exec_prefix}/lib
includedir=${exec_prefix}/include
Name: LibIDE
-Description: IDE components of GNOME Builder.
+Description: LibIDE contains the components used to build the GNOME Builder IDE.
Version: @VERSION@
-Libs: -L${libdir}/gnome-builder -lide-1.0
-Cflags: -I${includedir}/ide-1.0
+Libs: -L${libdir}/gnome-builder -lide-1.0 -legg-private -Ltemplate-glib-1.0
+Cflags: -I${includedir}/gnome-builder- VERSION@/libide -I${includedir}/gnome-builder- VERSION@/egg
-I${includedir}/gnome-builder- VERSION@/template-glib
Requires: gio-2.0 gtk+-3.0 gtksourceview-3.0
diff --git a/libide/Makefile.am b/libide/Makefile.am
index 054a895..b2a071b 100644
--- a/libide/Makefile.am
+++ b/libide/Makefile.am
@@ -6,268 +6,296 @@ EXTRA_DIST =
pkglibdir = $(libdir)/gnome-builder
pkglib_LTLIBRARIES = libide-1.0.la
-libide_1_0_la_public_sources = \
- directory/ide-directory-build-system.c \
+headersdir = $(includedir)/gnome-builder- VERSION@/libide
+nobase_headers_DATA = $(libide_1_0_la_public_headers)
+
+libide_1_0_la_public_headers = \
directory/ide-directory-build-system.h \
- directory/ide-directory-genesis-addin.c \
directory/ide-directory-genesis-addin.h \
- directory/ide-directory-plugin.c \
- directory/ide-directory-vcs.c \
directory/ide-directory-vcs.h \
- doap/ide-doap-person.c \
doap/ide-doap-person.h \
- doap/ide-doap.c \
doap/ide-doap.h \
- editor/ide-editor-perspective.c \
editor/ide-editor-perspective.h \
- editor/ide-editor-view-addin.c \
editor/ide-editor-view-addin.h \
- editor/ide-editor-view.c \
editor/ide-editor-view.h \
- genesis/ide-genesis-perspective.c \
- genesis/ide-genesis-perspective.h \
- genesis/ide-genesis-addin.c \
genesis/ide-genesis-addin.h \
- ide-application.c \
- ide-application.h \
- ide-application-addin.c \
+ genesis/ide-genesis-perspective.h \
ide-application-addin.h \
ide-application-credits.h \
- ide-application-tool.c \
ide-application-tool.h \
- ide-back-forward-item.c \
+ ide-application.h \
ide-back-forward-item.h \
- ide-back-forward-list.c \
- ide-back-forward-list-load.c \
- ide-back-forward-list-save.c \
ide-back-forward-list.h \
- ide-buffer-change-monitor.c \
ide-buffer-change-monitor.h \
- ide-buffer-manager.c \
ide-buffer-manager.h \
- ide-buffer.c \
ide-buffer.h \
- ide-build-result.c \
- ide-build-result.h \
- ide-build-result-addin.c \
ide-build-result-addin.h \
- ide-build-system.c \
+ ide-build-result.h \
ide-build-system.h \
- ide-builder.c \
ide-builder.h \
- ide-completion-item.c \
ide-completion-item.h \
- ide-completion-provider.c \
ide-completion-provider.h \
- ide-completion-results.c \
ide-completion-results.h \
- ide-configuration.c \
- ide-configuration.h \
- ide-configuration-manager.c \
ide-configuration-manager.h \
- ide-context.c \
+ ide-configuration.h \
ide-context.h \
- ide-debugger.c \
+ ide-debug.h \
ide-debugger.h \
- ide-deployer.c \
ide-deployer.h \
- ide-device-manager.c \
ide-device-manager.h \
- ide-device-provider.c \
ide-device-provider.h \
- ide-device.c \
ide-device.h \
- ide-diagnostic-provider.c \
ide-diagnostic-provider.h \
- ide-diagnostic.c \
ide-diagnostic.h \
- ide-diagnostician.c \
ide-diagnostician.h \
- ide-diagnostics.c \
ide-diagnostics.h \
- ide-enums.c \
ide-enums.h \
- ide-environment.c \
- ide-environment.h \
- ide-environment-editor.c \
- ide-environment-editor.h \
- ide-environment-editor-row.c \
ide-environment-editor-row.h \
- ide-environment-variable.c \
+ ide-environment-editor.h \
ide-environment-variable.h \
- ide-executable.c \
+ ide-environment.h \
ide-executable.h \
- ide-executer.c \
ide-executer.h \
- ide-extension-adapter.c \
ide-extension-adapter.h \
- ide-extension-set-adapter.c \
ide-extension-set-adapter.h \
- ide-file-settings.c \
ide-file-settings.defs \
ide-file-settings.h \
- ide-file.c \
ide-file.h \
- ide-fixit.c \
ide-fixit.h \
ide-global.h \
- ide-highlight-engine.c \
ide-highlight-engine.h \
- ide-highlight-index.c \
ide-highlight-index.h \
- ide-highlighter.c \
ide-highlighter.h \
ide-indent-style.h \
- ide-indenter.c \
ide-indenter.h \
- ide-layout.c \
- ide-layout.h \
- ide-layout-grid.c \
ide-layout-grid.h \
- ide-layout-pane.c \
ide-layout-pane.h \
- ide-layout-stack.c \
- ide-layout-stack.h \
ide-layout-stack-split.h \
- ide-layout-view.c \
+ ide-layout-stack.h \
ide-layout-view.h \
- ide-log.c \
+ ide-layout.h \
ide-log.h \
ide-macros.h \
- ide-object.c \
ide-object.h \
- ide-pattern-spec.c \
ide-pattern-spec.h \
- ide-perspective.c \
ide-perspective.h \
- ide-preferences-addin.c \
ide-preferences-addin.h \
- ide-preferences.c \
ide-preferences.h \
- ide-process.c \
ide-process.h \
- ide-progress.c \
ide-progress.h \
- ide-project-file.c \
ide-project-file.h \
- ide-project-files.c \
ide-project-files.h \
- ide-project-info.c \
ide-project-info.h \
- ide-project-item.c \
ide-project-item.h \
- ide-project-miner.c \
ide-project-miner.h \
- ide-project.c \
ide-project.h \
- ide-recent-projects.c \
ide-recent-projects.h \
- ide-runtime.c \
- ide-runtime.h \
- ide-runtime-manager.c \
+ ide-refactory.h \
ide-runtime-manager.h \
- ide-runtime-provider.c \
ide-runtime-provider.h \
- ide-refactory.c \
- ide-refactory.h \
- ide-script-manager.c \
+ ide-runtime.h \
ide-script-manager.h \
- ide-script.c \
ide-script.h \
- ide-search-context.c \
ide-search-context.h \
- ide-search-engine.c \
ide-search-engine.h \
- ide-search-provider.c \
ide-search-provider.h \
- ide-search-result.c \
+ ide-search-reducer.h \
ide-search-result.h \
- ide-service.c \
ide-service.h \
- ide-settings.c \
ide-settings.h \
- ide-source-location.c \
ide-source-location.h \
- ide-source-map.c \
ide-source-map.h \
- ide-source-range.c \
ide-source-range.h \
- ide-source-snippet-chunk.c \
ide-source-snippet-chunk.h \
- ide-source-snippet-context.c \
ide-source-snippet-context.h \
- ide-source-snippet.c \
ide-source-snippet.h \
- ide-source-snippets-manager.c \
ide-source-snippets-manager.h \
- ide-source-snippets.c \
ide-source-snippets.h \
- ide-source-view-mode.c \
ide-source-view-mode.h \
- ide-source-view.c \
ide-source-view.h \
- ide-subprocess-launcher.c \
ide-subprocess-launcher.h \
- ide-symbol-resolver.c \
- ide-symbol-resolver.h \
- ide-symbol.c \
- ide-symbol.h \
- ide-symbol-node.c \
ide-symbol-node.h \
- ide-symbol-tree.c \
+ ide-symbol-resolver.h \
ide-symbol-tree.h \
- ide-tags-builder.c \
+ ide-symbol.h \
ide-tags-builder.h \
- ide-target.c \
ide-target.h \
- ide-test-case.c \
ide-test-case.h \
- ide-test-suite.c \
ide-test-suite.h \
- ide-thread-pool.c \
ide-thread-pool.h \
- ide-tree-builder.c \
ide-tree-builder.h \
- ide-tree-node.c \
ide-tree-node.h \
ide-tree-types.h \
- ide-tree.c \
ide-tree.h \
ide-types.h \
- ide-unsaved-file.c \
ide-unsaved-file.h \
- ide-unsaved-files.c \
ide-unsaved-files.h \
- ide-uri.c \
ide-uri.h \
- ide-vcs-uri.c \
ide-vcs-uri.h \
- ide-vcs.c \
ide-vcs.h \
- ide-workbench.c \
+ ide-workbench-addin.h \
+ ide-workbench-header-bar.h \
ide-workbench.h \
+ ide-worker.h \
+ ide.h \
+ local/ide-local-device.h \
+ preferences/ide-preferences-bin.h \
+ preferences/ide-preferences-entry.h \
+ preferences/ide-preferences-flow-box.h \
+ preferences/ide-preferences-font-button.h \
+ preferences/ide-preferences-group.h \
+ search/ide-omni-search-display.h \
+ search/ide-omni-search-entry.h \
+ search/ide-omni-search-group.h \
+ search/ide-omni-search-row.h \
+ template/ide-project-template.h \
+ template/ide-template-base.h \
+ template/ide-template-provider.h \
+ util/ide-cairo.h \
+ util/ide-dnd.h \
+ util/ide-file-manager.h \
+ util/ide-gdk.h \
+ util/ide-gtk.h \
+ util/ide-line-reader.h \
+ util/ide-list-inline.h \
+ util/ide-pango.h \
+ util/ide-posix.h \
+ util/ide-rgba.h \
+ $(NULL)
+
+libide_1_0_la_public_sources = \
+ directory/ide-directory-build-system.c \
+ directory/ide-directory-genesis-addin.c \
+ directory/ide-directory-plugin.c \
+ directory/ide-directory-vcs.c \
+ doap/ide-doap-person.c \
+ doap/ide-doap.c \
+ editor/ide-editor-perspective.c \
+ editor/ide-editor-view-addin.c \
+ editor/ide-editor-view.c \
+ genesis/ide-genesis-addin.c \
+ genesis/ide-genesis-perspective.c \
+ ide-application-addin.c \
+ ide-application-tool.c \
+ ide-application.c \
+ ide-back-forward-item.c \
+ ide-back-forward-list-load.c \
+ ide-back-forward-list-save.c \
+ ide-back-forward-list.c \
+ ide-buffer-change-monitor.c \
+ ide-buffer-manager.c \
+ ide-buffer.c \
+ ide-build-result-addin.c \
+ ide-build-result.c \
+ ide-build-system.c \
+ ide-builder.c \
+ ide-completion-item.c \
+ ide-completion-provider.c \
+ ide-completion-results.c \
+ ide-configuration-manager.c \
+ ide-configuration.c \
+ ide-context.c \
+ ide-debugger.c \
+ ide-deployer.c \
+ ide-device-manager.c \
+ ide-device-provider.c \
+ ide-device.c \
+ ide-diagnostic-provider.c \
+ ide-diagnostic.c \
+ ide-diagnostician.c \
+ ide-diagnostics.c \
+ ide-enums.c \
+ ide-environment-editor-row.c \
+ ide-environment-editor.c \
+ ide-environment-variable.c \
+ ide-environment.c \
+ ide-executable.c \
+ ide-executer.c \
+ ide-extension-adapter.c \
+ ide-extension-set-adapter.c \
+ ide-file-settings.c \
+ ide-file-settings.defs \
+ ide-file.c \
+ ide-fixit.c \
+ ide-highlight-engine.c \
+ ide-highlight-index.c \
+ ide-highlighter.c \
+ ide-indenter.c \
+ ide-layout-grid.c \
+ ide-layout-pane.c \
+ ide-layout-stack.c \
+ ide-layout-view.c \
+ ide-layout.c \
+ ide-log.c \
+ ide-object.c \
+ ide-pattern-spec.c \
+ ide-perspective.c \
+ ide-preferences-addin.c \
+ ide-preferences.c \
+ ide-process.c \
+ ide-progress.c \
+ ide-project-file.c \
+ ide-project-files.c \
+ ide-project-info.c \
+ ide-project-item.c \
+ ide-project-miner.c \
+ ide-project.c \
+ ide-recent-projects.c \
+ ide-refactory.c \
+ ide-runtime-manager.c \
+ ide-runtime-provider.c \
+ ide-runtime.c \
+ ide-script-manager.c \
+ ide-script.c \
+ ide-search-context.c \
+ ide-search-engine.c \
+ ide-search-provider.c \
+ ide-search-result.c \
+ ide-service.c \
+ ide-settings.c \
+ ide-source-location.c \
+ ide-source-map.c \
+ ide-source-range.c \
+ ide-source-snippet-chunk.c \
+ ide-source-snippet-context.c \
+ ide-source-snippet.c \
+ ide-source-snippets-manager.c \
+ ide-source-snippets.c \
+ ide-source-view-mode.c \
+ ide-source-view.c \
+ ide-subprocess-launcher.c \
+ ide-symbol-node.c \
+ ide-symbol-resolver.c \
+ ide-symbol-tree.c \
+ ide-symbol.c \
+ ide-tags-builder.c \
+ ide-target.c \
+ ide-test-case.c \
+ ide-test-suite.c \
+ ide-thread-pool.c \
+ ide-tree-builder.c \
+ ide-tree-node.c \
+ ide-tree.c \
+ ide-unsaved-file.c \
+ ide-unsaved-files.c \
+ ide-uri.c \
+ ide-vcs-uri.c \
+ ide-vcs.c \
ide-workbench-addin.c \
- ide-workbench-addin.h \
ide-workbench-header-bar.c \
- ide-workbench-header-bar.h \
ide-workbench-open.c \
+ ide-workbench.c \
ide-worker.c \
- ide-worker.h \
ide.c \
- ide.h \
local/ide-local-device.c \
- local/ide-local-device.h \
template/ide-project-template.c \
- template/ide-project-template.h \
template/ide-template-base.c \
- template/ide-template-base.h \
template/ide-template-provider.c \
- template/ide-template-provider.h \
util/ide-file-manager.c \
- util/ide-file-manager.h \
$(NULL)
libide_1_0_la_SOURCES = \
+ $(libide_1_0_la_public_headers) \
$(libide_1_0_la_public_sources) \
editor/ide-editor-frame-actions.c \
editor/ide-editor-frame-actions.h \
@@ -310,7 +338,6 @@ libide_1_0_la_SOURCES = \
ide-battery-monitor.h \
ide-css-provider.c \
ide-css-provider.h \
- ide-debug.h \
ide-extension-util.c \
ide-extension-util.h \
ide-internal.h \
@@ -332,7 +359,6 @@ libide_1_0_la_SOURCES = \
ide-ref-ptr.c \
ide-ref-ptr.h \
ide-search-reducer.c \
- ide-search-reducer.h \
ide-shortcuts-window.c \
ide-shortcuts-window.h \
ide-source-iter.c \
@@ -366,57 +392,36 @@ libide_1_0_la_SOURCES = \
preferences/ide-preferences-builtin.c \
preferences/ide-preferences-builtin.h \
preferences/ide-preferences-bin.c \
- preferences/ide-preferences-bin.h \
preferences/ide-preferences-bin-private.h \
preferences/ide-preferences-entry.c \
- preferences/ide-preferences-entry.h \
preferences/ide-preferences-flow-box.c \
- preferences/ide-preferences-flow-box.h \
preferences/ide-preferences-font-button.c \
- preferences/ide-preferences-font-button.h \
preferences/ide-preferences-group.c \
- preferences/ide-preferences-group.h \
preferences/ide-preferences-group-private.h \
preferences/ide-preferences-language-row.c \
preferences/ide-preferences-language-row.h \
preferences/ide-preferences-page.c \
- preferences/ide-preferences-page.h \
preferences/ide-preferences-page-private.h \
preferences/ide-preferences-perspective.c \
preferences/ide-preferences-perspective.h \
preferences/ide-preferences-spin-button.c \
- preferences/ide-preferences-spin-button.h \
preferences/ide-preferences-switch.c \
- preferences/ide-preferences-switch.h \
search/ide-omni-search-display.c \
- search/ide-omni-search-display.h \
search/ide-omni-search-entry.c \
- search/ide-omni-search-entry.h \
search/ide-omni-search-group.c \
- search/ide-omni-search-group.h \
search/ide-omni-search-row.c \
- search/ide-omni-search-row.h \
theatrics/ide-box-theatric.c \
theatrics/ide-box-theatric.h \
util/ide-cairo.c \
- util/ide-cairo.h \
util/ide-dnd.c \
- util/ide-dnd.h \
util/ide-doc-seq.c \
util/ide-doc-seq.h \
util/ide-gdk.c \
- util/ide-gdk.h \
util/ide-gtk.c \
- util/ide-gtk.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-posix.c \
- util/ide-posix.h \
util/ide-rgba.c \
- util/ide-rgba.h \
util/ide-text-util.c \
util/ide-text-util.h \
util/ide-window-settings.c \
@@ -566,6 +571,7 @@ INTROSPECTION_COMPILER_ARGS = \
introspection_sources = \
$(libide_1_0_la_public_sources) \
+ $(libide_1_0_la_public_headers) \
$(NULL)
Ide-1.0.gir: libide-1.0.la
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]