[gitg] Locate resource from $(srcdir)
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg] Locate resource from $(srcdir)
- Date: Fri, 3 Jan 2014 20:14:33 +0000 (UTC)
commit 25263302093d2010a11a5cbd1976ecc556bc0be5
Author: Jesse van den Kieboom <jessevdk gmail com>
Date: Fri Jan 3 19:42:24 2014 +0100
Locate resource from $(srcdir)
gitg/Makefile.am | 6 +++---
libgitg-ext/Makefile.am | 2 +-
plugins/diff/Makefile.am | 4 ++--
plugins/files/Makefile.am | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/gitg/Makefile.am b/gitg/Makefile.am
index 9164552..ece16ef 100644
--- a/gitg/Makefile.am
+++ b/gitg/Makefile.am
@@ -72,7 +72,7 @@ gitg_SOURCES = \
$(gitg_VALASOURCES) \
gitg-resources.c
-gitg-resources.c: resources/gitg-resources.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies
--sourcedir $(srcdir)/resources resources/gitg-resources.xml)
+gitg-resources.c: resources/gitg-resources.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies
--sourcedir $(srcdir)/resources $(srcdir)/resources/gitg-resources.xml)
$(GLIB_COMPILE_RESOURCES) --generate-source \
--sourcedir $(srcdir)/resources \
--target "$@" "$<"
@@ -82,9 +82,9 @@ gitg-resources.h: resources/gitg-resources.xml $(shell $(GLIB_COMPILE_RESOURCES)
--sourcedir $(srcdir)/resources \
--target "$@" "$<"
-EXTRA_DIST = \
+EXTRA_DIST = \
resources/gitg-resources.xml \
- $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir)/resources
resources/gitg-resources.xml)
+ $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir)/resources
$(srcdir)/resources/gitg-resources.xml)
-include $(top_srcdir)/git.mk
diff --git a/libgitg-ext/Makefile.am b/libgitg-ext/Makefile.am
index 35c6efe..f74ddf8 100644
--- a/libgitg-ext/Makefile.am
+++ b/libgitg-ext/Makefile.am
@@ -96,7 +96,7 @@ endif
libgitg_ext_1_0_la_pkgconfigdir = $(libdir)/pkgconfig
libgitg_ext_1_0_la_pkgconfig_DATA = libgitg-ext-1.0.pc
-gitg-ext-resources.c: resources/resources.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies
--sourcedir $(srcdir)/resources resources/resources.xml)
+gitg-ext-resources.c: resources/resources.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies
--sourcedir $(srcdir)/resources $(srcdir)/resources/resources.xml)
$(GLIB_COMPILE_RESOURCES) --generate-source \
--sourcedir $(srcdir)/resources \
--target "$@" "$<"
diff --git a/plugins/diff/Makefile.am b/plugins/diff/Makefile.am
index f2625eb..00e5fb5 100644
--- a/plugins/diff/Makefile.am
+++ b/plugins/diff/Makefile.am
@@ -26,7 +26,7 @@ libdiff_la_plugindir = $(GITG_PLUGIN_LIBDIR)
libdiff_la_plugin_LTLIBRARIES = libdiff.la
libdiff_la_plugin_DATA = diff.plugin
-gitg-diff-resources.c: resources/resources.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies
--sourcedir $(srcdir)/resources resources/resources.xml)
+gitg-diff-resources.c: resources/resources.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies
--sourcedir $(srcdir)/resources $(srcdir)/resources/resources.xml)
$(GLIB_COMPILE_RESOURCES) --generate-source \
--sourcedir $(srcdir)/resources \
--target "$@" "$<"
@@ -39,7 +39,7 @@ gitg-diff-resources.h: resources/resources.xml $(shell $(GLIB_COMPILE_RESOURCES)
EXTRA_DIST = \
$(libdiff_la_plugin_DATA) \
resources/resources.xml \
- $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir)/resources
resources/resources.xml)
+ $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir)/resources
$(srcdir)/resources/resources.xml)
-include $(top_srcdir)/git.mk
diff --git a/plugins/files/Makefile.am b/plugins/files/Makefile.am
index e352941..ebe67c0 100644
--- a/plugins/files/Makefile.am
+++ b/plugins/files/Makefile.am
@@ -25,7 +25,7 @@ libfiles_la_plugindir = $(GITG_PLUGIN_LIBDIR)
libfiles_la_plugin_LTLIBRARIES = libfiles.la
libfiles_la_plugin_DATA = files.plugin
-gitg-files-resources.c: resources/resources.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies
--sourcedir $(srcdir)/resources resources/resources.xml)
+gitg-files-resources.c: resources/resources.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies
--sourcedir $(srcdir)/resources $(srcdir)/resources/resources.xml)
$(GLIB_COMPILE_RESOURCES) --generate-source \
--sourcedir $(srcdir)/resources \
--target "$@" "$<"
@@ -38,7 +38,7 @@ gitg-files-resources.h: resources/resources.xml $(shell $(GLIB_COMPILE_RESOURCES
EXTRA_DIST = \
$(libfiles_la_plugin_DATA) \
resources/resources.xml \
- $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir)/resources
resources/resources.xml)
+ $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir)/resources
$(srcdir)/resources/resources.xml)
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]