Skip to content

Commit

Permalink
build: try to fix the build when srcdir != builddir
Browse files Browse the repository at this point in the history
  • Loading branch information
Carlos Garcia Campos committed Aug 4, 2014
1 parent 48110cb commit 2188332
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
1 change: 1 addition & 0 deletions data/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ EXTRA_DIST = \
$(man_MANS) \
evince.ico \
evince.convert \
thumbnail-frame.png \
$(NULL)

#
Expand Down
4 changes: 2 additions & 2 deletions previewer/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
7 changes: 3 additions & 4 deletions shell/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down

0 comments on commit 2188332

Please sign in to comment.