[shotwell] build: Fix out-of-tree build
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell] build: Fix out-of-tree build
- Date: Sun, 10 Jul 2016 12:08:08 +0000 (UTC)
commit bd7a1964184dd219c742503f7969bf6f806e39a6
Author: Jens Georg <mail jensge org>
Date: Sun Jul 10 14:07:39 2016 +0200
build: Fix out-of-tree build
Signed-off-by: Jens Georg <mail jensge org>
import.am | 4 ++--
publish-extra.am | 4 ++--
publish.am | 2 +-
shotwell.am | 4 ++--
transition.am | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/import.am b/import.am
index b0f55c8..13b67c2 100644
--- a/import.am
+++ b/import.am
@@ -30,12 +30,12 @@ plugins_shotwell_data_imports_shotwell_data_imports_la_VALAFLAGS = \
--pkg libxml-2.0 \
--pkg webkit2gtk-4.0 \
--pkg sqlite3 \
- --vapidir $(top_srcdir)/plugins
+ --vapidir $(abs_top_srcdir)/plugins
plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS = \
$(PLUGIN_CFLAGS) \
$(COMMON_CFLAGS) \
- -I $(top_srcdir)/plugins
+ -I $(abs_top_srcdir)/plugins
plugins_shotwell_data_imports_shotwell_data_imports_la_LDFLAGS = \
$(SHOTWELL_PLUGIN_LDFLAGS)
diff --git a/publish-extra.am b/publish-extra.am
index 7de4d24..6c713bf 100644
--- a/publish-extra.am
+++ b/publish-extra.am
@@ -30,12 +30,12 @@ plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS = \
--pkg shotwell-plugin-dev-1.0 \
--pkg libxml-2.0 \
--pkg webkit2gtk-4.0 \
- --vapidir $(top_srcdir)/plugins
+ --vapidir $(abs_top_srcdir)/plugins
plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_CFLAGS = \
$(PLUGIN_CFLAGS) \
$(COMMON_CFLAGS) \
- -I $(top_srcdir)/plugins
+ -I $(abs_top_srcdir)/plugins
plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_LDFLAGS = \
$(SHOTWELL_PLUGIN_LDFLAGS)
diff --git a/publish.am b/publish.am
index ba40278..93ec0cb 100644
--- a/publish.am
+++ b/publish.am
@@ -34,7 +34,7 @@ plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS = \
--pkg shotwell-plugin-dev-1.0 \
--pkg libxml-2.0 \
--pkg webkit2gtk-4.0 \
- --vapidir $(top_srcdir)/plugins
+ --vapidir $(abs_top_srcdir)/plugins
plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS = \
$(PLUGIN_CFLAGS) \
diff --git a/shotwell.am b/shotwell.am
index 1e9caa2..4fbf132 100644
--- a/shotwell.am
+++ b/shotwell.am
@@ -4,13 +4,13 @@ shotwell_CFLAGS = \
$(UNITY_CFLAGS) \
$(COMMON_CFLAGS) \
-I$(top_builddir)/plugins \
- -I$(top_srcdir)/plugins
+ -I$(abs_top_srcdir)/plugins
shotwell_LDADD = src/plugins/libplugin.la $(SHOTWELL_LIBS) $(UNITY_LIBS)
shotwell_VALAFLAGS = $(COMMON_VALAFLAGS) \
--pkg gio-2.0 --pkg gtk+-3.0 --pkg gee-0.8 \
--pkg gio-unix-2.0 --pkg sqlite3 --pkg gmodule-2.0 \
- --vapidir $(top_srcdir)/vapi \
+ --vapidir $(abs_top_srcdir)/vapi \
--pkg libgphoto2 --pkg posix --pkg LConv --pkg libraw --pkg gexiv2 \
--pkg libexif --pkg gudev-1.0 --pkg gstreamer-1.0 \
--pkg gstreamer-pbutils-1.0 \
diff --git a/transition.am b/transition.am
index 029b322..f055536 100644
--- a/transition.am
+++ b/transition.am
@@ -26,12 +26,12 @@ plugins_shotwell_transitions_shotwell_transitions_la_VALAFLAGS = \
--pkg shotwell-plugin-dev-1.0 \
--pkg libxml-2.0 \
--pkg webkit2gtk-4.0 \
- --vapidir $(top_srcdir)/plugins
+ --vapidir $(abs_top_srcdir)/plugins
plugins_shotwell_transitions_shotwell_transitions_la_CFLAGS = \
$(PLUGIN_CFLAGS) \
$(COMMON_CFLAGS) \
- -I $(top_srcdir)/plugins
+ -I $(abs_top_srcdir)/plugins
plugins_shotwell_transitions_shotwell_transitions_la_LDFLAGS = \
$(SHOTWELL_PLUGIN_LDFLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]