[nautilus-python] Some build fixes



commit d8d711e1fe17852f52d537ea43cccdc8b9fd4d35
Author: Adam Plumb <adamplumb gmail com>
Date:   Tue Jan 2 16:41:03 2018 -0500

    Some build fixes

 Makefile.am      |    1 +
 configure.ac     |    2 +-
 docs/Makefile.am |   14 +++++++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 144e7d2..980a843 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,7 @@ SUBDIRS = src examples
 
 if ENABLE_GTK_DOC
 SUBDIRS += docs
+CLEANFILES = html.stamp
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/configure.ac b/configure.ac
index 53f9980..e1f7df8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
 dnl Check for gtk-doc
-GTK_DOC_CHECK(1.9)
+GTK_DOC_CHECK(1.14)
 
 dnl Give error and exit if we don't have pkgconfig
 if test "x$HAVE_PKGCONFIG" = "xno"; then
diff --git a/docs/Makefile.am b/docs/Makefile.am
index e7ce215..110cc71 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,9 +1,12 @@
+docsdir = $(docdir)
+
 BUILDDIR = $(top_builddir)/docs
 
 REF_VERSION = $(VERSION)
 FULL_VERSION = $(VERSION)
 
-XML_FILES =                                                    \
+XMLdir = $(docsdir)/reference
+XML_DATA =                                                     \
        reference/nautilus-python-ref.xml                       \
        reference/nautilus-python-overview.xml                  \
        reference/nautilus-python-overview-example.xml                  \
@@ -23,7 +26,7 @@ XML_FILES =                                                   \
        reference/nautilus-python-enum-reference.xml \
        reference/nautilus-python-operation-result.xml
 
-HTMLdir = $(datadir)/gtk-doc/html/nautilus-python
+HTMLdir = $(HTML_DIR)/nautilus-python
 HTML_DATA =                                            \
        index.html                                      \
        index.sgml                                      \
@@ -52,7 +55,8 @@ HTML_DATA =                                           \
 
 BUILT_SOURCES =                \
        reference/builddate.xml \
-       $(HTML_DATA)
+       $(HTML_DATA) \
+       $(XML_DATA)
 
 CLEANFILES =                   \
        nautilus-python-ref.*   \
@@ -60,12 +64,12 @@ CLEANFILES =                        \
        $(HTML_DATA)
 
 EXTRA_DIST =           \
-       $(XML_FILES)     \
+       $(XML_DATA)     \
        $(HTML_DATA)
 
 REFERENCE_DEPS =       \
        reference       \
-       $(XML_FILES) 
+       $(XML_DATA) 
 
 if ENABLE_GTK_DOC
 


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