[evince] build: try to fix the build when srcdir != builddir



commit 21883321ea13eba97f1222f63a68200951759077
Author: Carlos Garcia Campos <carlosgc gnome org>
Date:   Mon Aug 4 14:27:17 2014 +0200

    build: try to fix the build when srcdir != builddir

 data/Makefile.am      |    1 +
 previewer/Makefile.am |    4 ++--
 shell/Makefile.am     |    7 +++----
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 05e2fb7..9f249a3 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -89,6 +89,7 @@ EXTRA_DIST =                                  \
        $(man_MANS)                             \
        evince.ico                              \
        evince.convert                          \
+       thumbnail-frame.png                     \
        $(NULL)
 
 #
diff --git a/previewer/Makefile.am b/previewer/Makefile.am
index e2ddca4..c659d06 100644
--- a/previewer/Makefile.am
+++ b/previewer/Makefile.am
@@ -36,8 +36,8 @@ evince_previewer_LDADD = \
        $(top_builddir)/libmisc/libevmisc.la            \
        $(PREVIEWER_LIBS)
 
-ev-previewer-resources.c: previewer.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) 
--generate-dependencies --sourcedir=$(srcdir) --sourcedir=$(top_builddir)/data 
$(srcdir)/previewer.gresource.xml)
-       $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) 
--sourcedir=$(top_builddir)/data --generate-source --c-name ev_previewer $<
+ev-previewer-resources.c: previewer.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) 
--generate-dependencies --sourcedir=$(srcdir) --sourcedir=$(top_srcdir)/data 
$(srcdir)/previewer.gresource.xml)
+       $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) 
--sourcedir=$(top_srcdir)/data --generate-source --c-name ev_previewer $<
 
 EXTRA_DIST = \
        previewer.gresource.xml \
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 45a69c0..debb80b 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -172,11 +172,10 @@ EXTRA_DIST = \
        evince-icon.rc \
        evince.gresource.xml \
        ev-gdbus.xml \
-       ev-daemon-gdbus.xml \
-       thumbnail-frame.png
+       ev-daemon-gdbus.xml
 
-ev-resources.c: evince.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies 
--sourcedir=$(srcdir) --sourcedir=$(top_builddir)/data $(srcdir)/evince.gresource.xml)
-       $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir=$(srcdir) 
--sourcedir=$(top_builddir)/data --generate-source --c-name ev $<
+ev-resources.c: evince.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies 
--sourcedir=$(srcdir) --sourcedir=$(top_srcdir)/data $(srcdir)/evince.gresource.xml)
+       $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir=$(srcdir) 
--sourcedir=$(top_srcdir)/data --generate-source --c-name ev $<
 
 ev-gdbus-generated.c ev-gdbus-generated.h: ev-gdbus.xml Makefile
        $(AM_V_GEN) $(GDBUS_CODEGEN) \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]