diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-05-27 15:12:38 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-05-27 15:12:38 +0200 |
| commit | a2fbdb1a3cd9d137010182be43fdf4ff8491dd9f (patch) | |
| tree | 304500ca80ee6ca0cd2ea8888f1ed8f48834d4ba | |
| parent | ad14c9c4c1345fe01336fc0d5bfccd3fca248ce1 (diff) | |
Fix problems with 'make distcheck'
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | doc/Makefile.am | 3 | ||||
| -rw-r--r-- | gtk-doc.make | 9 | ||||
| -rw-r--r-- | tests/Makefile.am | 8 |
4 files changed, 17 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index a0dd689..52cfcae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,6 +8,10 @@ SUBDIRS = \ ACLOCAL_AMFLAGS = -I m4 +DISTCHECK_CONFIGURE_FLAGS = \ + --enable-gtk-doc \ + --disable-coverage + dist-hook: @if test -d "$(srcdir)/.git"; \ then \ diff --git a/doc/Makefile.am b/doc/Makefile.am index de16a67..904de7b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -69,4 +69,5 @@ GTKDOC_LIBS= include $(top_srcdir)/gtk-doc.make EXTRA_DIST += \ - version.xml.in + version.xml.in \ + version.xml
\ No newline at end of file diff --git a/gtk-doc.make b/gtk-doc.make index 00b080f..c0ccd79 100644 --- a/gtk-doc.make +++ b/gtk-doc.make @@ -28,7 +28,8 @@ EXTRA_DIST = \ $(HTML_IMAGES) \ $(DOC_MAIN_SGML_FILE) \ $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt + $(DOC_MODULE)-overrides.txt \ + style.css DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ pdf-build.stamp \ @@ -124,7 +125,7 @@ sgml.stamp: sgml-build.stamp #### html #### -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) style.css +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(srcdir)/style.css @echo 'gtk-doc: Building HTML' @-chmod -R u+w $(srcdir) @rm -rf $(srcdir)/html @@ -138,8 +139,8 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) style.css @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) @echo 'gtk-doc: Fixing cross-references' @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) | grep -v "no link for.*CK-.*CAPS" || true - @mv html/style.css html/gtk-doc.css - @cp $(srcdir)/style.css html + @mv $(srcdir)/html/style.css $(srcdir)/html/gtk-doc.css + @cp $(srcdir)/style.css $(srcdir)/html/style.css @touch html-build.stamp #### pdf #### diff --git a/tests/Makefile.am b/tests/Makefile.am index bb4bce3..bd72968 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/p11-kit \ - -Icutest \ + -I$(srcdir)/cutest \ -DSRCDIR=\"$(srcdir)\" \ -DP11_KIT_API_SUBJECT_TO_CHANGE @@ -23,4 +23,8 @@ uri_test_LDADD = \ check-am: ./hash-test ./conf-test - ./uri-test
\ No newline at end of file + ./uri-test + +EXTRA_DIST = \ + cutest \ + files
\ No newline at end of file |