From b8111c665647a395770fadcd7e174e80e12069c1 Mon Sep 17 00:00:00 2001 From: Jesse van den Kieboom Date: Thu, 9 Jan 2014 20:00:24 +0100 Subject: [PATCH] Install libraries as part of the install-exec rule --- libgitg-ext/Makefile.am | 4 ++-- libgitg/Makefile.am | 4 ++-- plugins/diff/Makefile.am | 10 ++++++---- plugins/files/Makefile.am | 10 ++++++---- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/libgitg-ext/Makefile.am b/libgitg-ext/Makefile.am index 2d3190b1..223e1e6c 100644 --- a/libgitg-ext/Makefile.am +++ b/libgitg-ext/Makefile.am @@ -1,5 +1,5 @@ -libgitg_extdir = $(libdir) -libgitg_ext_LTLIBRARIES = libgitg-ext/libgitg-ext-1.0.la +libgitg_extexecdir = $(libdir) +libgitg_extexec_LTLIBRARIES = libgitg-ext/libgitg-ext-1.0.la libgitg_ext_libgitg_ext_1_0_la_CPPFLAGS = \ -I$(top_srcdir) \ diff --git a/libgitg/Makefile.am b/libgitg/Makefile.am index 44b7baca..39716f7e 100644 --- a/libgitg/Makefile.am +++ b/libgitg/Makefile.am @@ -1,5 +1,5 @@ -libgitgdir = $(libdir) -libgitg_LTLIBRARIES = libgitg/libgitg-1.0.la +libgitgexecdir = $(libdir) +libgitgexec_LTLIBRARIES = libgitg/libgitg-1.0.la libgitg_libgitg_1_0_la_CPPFLAGS = \ -I$(top_srcdir) \ diff --git a/plugins/diff/Makefile.am b/plugins/diff/Makefile.am index 377de929..69e69a95 100644 --- a/plugins/diff/Makefile.am +++ b/plugins/diff/Makefile.am @@ -1,6 +1,8 @@ -plugins_diff_libdiff_la_plugindir = $(GITG_PLUGIN_LIBDIR) -plugins_diff_libdiff_la_plugin_LTLIBRARIES = plugins/diff/libdiff.la -plugins_diff_libdiff_la_plugin_DATA = plugins/diff/diff.plugin +plugins_diff_libdiff_la_pluginexecdir = $(GITG_PLUGIN_LIBDIR) +plugins_diff_libdiff_la_pluginexec_LTLIBRARIES = plugins/diff/libdiff.la + +plugins_diff_libdiff_la_plugindatadir = $(GITG_PLUGIN_LIBDIR) +plugins_diff_libdiff_la_plugindata_DATA = plugins/diff/diff.plugin plugins_diff_libdiff_la_CPPFLAGS = \ -I$(top_srcdir) \ @@ -41,7 +43,7 @@ CLEANFILES += \ plugins/diff/gitg-diff-resources.c EXTRA_DIST += \ - $(plugins_diff_libdiff_la_plugin_DATA) \ + $(plugins_diff_libdiff_la_plugindata_DATA) \ $(plugins_diff_libdiff_resources_deps) SCALABLE_ICONS += plugins/diff/icons/diff-symbolic.svg diff --git a/plugins/files/Makefile.am b/plugins/files/Makefile.am index 5c09726c..6c4462f1 100644 --- a/plugins/files/Makefile.am +++ b/plugins/files/Makefile.am @@ -1,6 +1,8 @@ -plugins_files_libfiles_la_plugindir = $(GITG_PLUGIN_LIBDIR) -plugins_files_libfiles_la_plugin_LTLIBRARIES = plugins/files/libfiles.la -plugins_files_libfiles_la_plugin_DATA = plugins/files/files.plugin +plugins_files_libfiles_la_pluginexecdir = $(GITG_PLUGIN_LIBDIR) +plugins_files_libfiles_la_pluginexec_LTLIBRARIES = plugins/files/libfiles.la + +plugins_files_libfiles_la_plugindatadir = $(GITG_PLUGIN_LIBDIR) +plugins_files_libfiles_la_plugindata_DATA = plugins/files/files.plugin plugins_files_libfiles_la_CPPFLAGS = \ -I$(top_srcdir) \ @@ -42,7 +44,7 @@ CLEANFILES += \ plugins/files/gitg-files-resources.c EXTRA_DIST += \ - $(plugins_files_libfiles_la_plugin_DATA) \ + $(plugins_files_libfiles_la_plugindata_DATA) \ $(plugins_files_libfiles_resources_deps) # vi:ts=8:noet