Fix problems with 'make distcheck'

diff --git a/Makefile.am b/Makefile.am
index a0dd689020432f25099a43adacf7b72dd2cb6df3..52cfcaed6cf66a0c2df9577a642bde718a939a6f 100644 (file)
--- 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 de16a67cd7baf2bde0f9b27022212f9211f2c3eb..904de7be11958e9d481c9230e351703441760814 100644 (file)
--- 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 00b080f8c59f1f6d1c53b8d2e9643814ae9f7314..c0ccd799ce018c9a3a30638e3de8e3adeaf1eb02 100644 (file)
--- 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 bb4bce364a9badb103cc773ed8e8879884dcaa07..bd72968a20a296be9d08e6cfcc385e291a1e2b9f 100644 (file)
--- 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