maybe this fixes travis

This commit is contained in:
John Cupitt 2014-12-04 21:40:38 +00:00
parent 9ae19ed727
commit 9f0032ac03

View File

@ -33,9 +33,9 @@ EXTRA_DIST = \
$(HTML_IMAGES) \ $(HTML_IMAGES) \
$(SETUP_FILES) $(SETUP_FILES)
DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \ DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
html-build.stamp pdf-build.stamp \ html-build.stamp pdf-build.stamp \
sgml.stamp html.stamp pdf.stamp tmpl.stamp sgml.stamp html.stamp pdf.stamp
SCANOBJ_FILES = \ SCANOBJ_FILES = \
$(DOC_MODULE).args \ $(DOC_MODULE).args \
@ -89,16 +89,18 @@ setup-build.stamp:
files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
if test "x$$files" != "x" ; then \ if test "x$$files" != "x" ; then \
for file in $$files ; do \ for file in $$files ; do \
destdir=`dirname $(abs_builddir)/$$file`; \ destdir=`dirname $(abs_builddir)/$$file` ;\
test -d "$$destdir" || mkdir -p "$$destdir"; \ test -d "$$destdir" || mkdir -p "$$destdir"; \
test -f $(abs_srcdir)/$$file && \ test -f $(abs_srcdir)/$$file && \
cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
done; \ done; \
fi; \ fi; \
test -d $(abs_srcdir)/tmpl && \
{ cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \
chmod -R u+w $(abs_builddir)/tmpl; } \
fi fi
$(AM_V_at)touch setup-build.stamp $(AM_V_at)touch setup-build.stamp
#### scan #### #### scan ####
GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V)) GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V))
@ -135,14 +137,35 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
@true @true
#### templates ####
GTK_DOC_V_TMPL=$(GTK_DOC_V_TMPL_$(V))
GTK_DOC_V_TMPL_=$(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY))
GTK_DOC_V_TMPL_0=@echo " DOC Rebuilding template files";
tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
$(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
$(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
if test -w $(abs_srcdir) ; then \
cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \
fi \
fi
$(AM_V_at)touch tmpl-build.stamp
tmpl.stamp: tmpl-build.stamp
@true
$(srcdir)/tmpl/*.sgml:
@true
#### xml #### #### xml ####
GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V)) GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V))
GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
GTK_DOC_V_XML_0=@echo " DOC Building XML"; GTK_DOC_V_XML_0=@echo " DOC Building XML";
sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
$(GTK_DOC_V_XML)_source_dir='' ; \ -$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \
for i in $(DOC_SOURCE_DIR) ; do \ for i in $(DOC_SOURCE_DIR) ; do \
_source_dir="$${_source_dir} --source-dir=$$i" ; \ _source_dir="$${_source_dir} --source-dir=$$i" ; \
done ; \ done ; \
@ -229,6 +252,7 @@ distclean-local:
$(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
rm -rf tmpl; \
fi fi
maintainer-clean-local: maintainer-clean-local:
@ -278,7 +302,9 @@ dist-check-gtkdoc:
endif endif
dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
@mkdir $(distdir)/tmpl
@mkdir $(distdir)/html @mkdir $(distdir)/html
@-cp ./tmpl/*.sgml $(distdir)/tmpl
@cp ./html/* $(distdir)/html @cp ./html/* $(distdir)/html
@-cp ./$(DOC_MODULE).pdf $(distdir)/ @-cp ./$(DOC_MODULE).pdf $(distdir)/
@-cp ./$(DOC_MODULE).types $(distdir)/ @-cp ./$(DOC_MODULE).types $(distdir)/