[Xfce4-commits] <thunarx-python:master> Cleaned up the docs makefiles somewhat

Adam Plumb noreply at xfce.org
Fri Mar 25 19:42:02 CET 2011


Updating branch refs/heads/master
         to 498daa46c98fefccee671d0d88656c0bce6c56bd (commit)
       from 2d81676afbe2409eda89d8ed5eb62b79ad66876a (commit)

commit 498daa46c98fefccee671d0d88656c0bce6c56bd
Author: Adam Plumb <adamplumb at gmail.com>
Date:   Fri Mar 25 14:41:19 2011 -0400

    Cleaned up the docs makefiles somewhat

 Makefile.am      |   12 ------------
 docs/Makefile.am |   13 +++++--------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 459e70c..a46e4bb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,16 +4,4 @@ if ENABLE_GTK_DOC
 SUBDIRS += docs
 endif
 
-distclean-local:
-	rm -rf *.spec *.cache *~
-
-rpm: dist
-	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
-	@rm -f $(PACKAGE)-$(VERSION).tar.gz
-
-dist-hook:
-	echo "==== DIST HOOK ===="
-	echo "`pwd`" 
-	test -d "$(srcdir)/docs/html" && mv $(srcdir)/docs/html $(distdir)/docs || echo
-
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 1080f6b..6d67e4f 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -23,7 +23,7 @@ XMLFILES = 							\
 	reference/thunarx-python-file-info.xml
 
 HTMLdir = $(datadir)/gtk-doc/html/thunarx-python
-HTML_DATA =						\
+HTMLFILES =						\
 	html/index.html					\
 	html/index.sgml					\
 	html/thunarx-python-overview.html \
@@ -44,14 +44,13 @@ CSSdir = $(HTMLdir)
 CSS_DATA = $(CSS_FILES)
 
 BUILT_SOURCES = 		\
-	build_stamp 		\
 	reference/builddate.xml	\
-	$(HTML_DATA)
+	$(HTMLFILES)
 
 CLEANFILES = 			\
-	build_stamp 		\
 	thunarx-python-ref.*	\
-	reference/builddate.xml
+	reference/builddate.xml \
+	$(HTMLFILES)
 
 EXTRA_DIST = 		\
 	$(XMLFILES) 
@@ -60,14 +59,12 @@ REFERENCE_DEPS = 	\
 	reference 	\
 	$(XMLFILES)
 
-$(HTML_DATA): build_stamp
-
 if ENABLE_GTK_DOC
 
 reference/builddate.xml: $(REFERENCE_DEPS)
 	$(PYTHON) -c 'import datetime; print datetime.date.today()' > $@
 
-build_stamp: $(REFERENCE_DEPS) reference/builddate.xml
+$(HTMLFILES): $(REFERENCE_DEPS) reference/builddate.xml
 	xsltproc --nonet --xinclude -o $(BUILDDIR)/html/ \
 		 --path $(BUILDDIR)/reference:$(srcdir)/reference \
 		 --stringparam gtkdoc.bookname "thunarx-python" \



More information about the Xfce4-commits mailing list