couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject git commit: Ripped out stupid Autotools info handling
Date Sun, 14 Oct 2012 13:46:32 GMT
Updated Branches:
  refs/heads/docs 143aee19a -> b4a59d641


Ripped out stupid Autotools info handling


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b4a59d64
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b4a59d64
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b4a59d64

Branch: refs/heads/docs
Commit: b4a59d6414c7517cfc40a2db4db85c462df2c982
Parents: 143aee1
Author: Noah Slater <nslater@apache.org>
Authored: Sun Oct 14 14:46:28 2012 +0100
Committer: Noah Slater <nslater@apache.org>
Committed: Sun Oct 14 14:46:28 2012 +0100

----------------------------------------------------------------------
 bin/Makefile.am              |    2 +-
 bootstrap                    |   15 -------------
 share/doc/build/Makefile.am  |   40 +++++++++++++++++-------------------
 src/couchdb/priv/Makefile.am |    2 +-
 4 files changed, 21 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/b4a59d64/bin/Makefile.am
----------------------------------------------------------------------
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 5770e20..4d66157 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -120,5 +120,5 @@ couchdb.1: couchdb.tpl.in
 	    $(HELP2MAN) $(HELP2MAN_OPTION) \
 	        --name="Apache CouchDB database server" ./couchdb --output $@; \
 	else \
-	    touch $@; \
+	    $(top_srcdir)/build-aux/missing help2man; \
 	fi

http://git-wip-us.apache.org/repos/asf/couchdb/blob/b4a59d64/bootstrap
----------------------------------------------------------------------
diff --git a/bootstrap b/bootstrap
index 8534c0f..8da3dd2 100755
--- a/bootstrap
+++ b/bootstrap
@@ -113,27 +113,12 @@ fi
 mkdir -p build-aux
 mkdir -p m4
 
-# If automake gets invoked from a partially updated source tree, this file
-# is not created, and the build will fail, and need another bootstrap.
-
-# @@ figure out how to avoid this
-
-info_file="share/doc/build/texinfo/CouchDB"
-
-mkdir -p `dirname $info_file`
-
-cat > $info_file".texi" << EOF
-@setfilename CouchDB
-EOF
-
 ${LIBTOOLIZE} -f -c --automake
 ${ACLOCAL} -I m4 -Wall
 ${AUTOHEADER} -f
 ${AUTOMAKE} -f -a -Wall
 ${AUTOCONF} -f -Wall
 
-touch $info_file
-
 rm -f INSTALL
 
 ln -f -s "`dirname \`readlink build-aux/missing\``/INSTALL"

http://git-wip-us.apache.org/repos/asf/couchdb/blob/b4a59d64/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index 38a6aba..0e52849 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -163,7 +163,9 @@ src_files = \
 
 info_TEXINFOS = $(texinfo_files)
 
-dist_localdoc_DATA = $(pdf_files)
+dist_localdoc_DATA = \
+    $(texinfo_files)
+    $(pdf_files) \
 
 nobase_dist_localdoc_DATA = $(html_files)
 
@@ -189,10 +191,13 @@ $(texinfo_files): texinfo.stamp
 texinfo.stamp: $(image_files) $(src_files)
 	@rm -f texinfo.tmp
 	@touch texinfo.tmp
-	if test -x "$(SPHINX_BUILD)" -a -n "$(HAS_MAKEINFO)"; then \
+	if test -n "$(HAS_MAKEINFO)"; then
+	    $(top_srcdir)/build-aux/missing makeinfo; \
+	fi
+	if test -x "$(SPHINX_BUILD)"; then \
 	    $(SPHINX_BUILD) -b texinfo $(SPHINXOPTS) $(builddir)/texinfo; \
 	else \
-	    touch $(texinfo_files); \
+	    $(top_srcdir)/build-aux/missing sphinx-build; \
 	fi
 	@mv -f texinfo.tmp $@
 
@@ -205,12 +210,15 @@ $(pdf_files): pdf.stamp
 pdf.stamp: $(image_files) $(src_files)
 	@rm -f pdf.tmp
 	@touch pdf.tmp
-	if test -x "$(SPHINX_BUILD)" -a -n "$(HAS_PDFLATEX)"; then \
+	if test -n "$(HAS_PDFLATEX)"; then
+	    $(top_srcdir)/build-aux/missing pdflatex; \
+	fi
+		if test -x "$(SPHINX_BUILD)"; then \
 	    $(SPHINX_BUILD) -b latex $(SPHINXOPTS) $(builddir)/latex; \
 	    $(MAKE) -C latex all-pdf; \
 	    gzip -9 < latex/CouchDB.pdf > latex/CouchDB.pdf.gz; \
 	else \
-	    touch $(texinfo_files); \
+	    $(top_srcdir)/build-aux/missing sphinx-build; \
 	fi
 	@mv -f pdf.tmp $@
 
@@ -225,32 +233,22 @@ html.stamp: $(image_files) $(src_files)
 	@touch html.tmp
 	if test -x "$(SPHINX_BUILD)"; then \
 	    $(SPHINX_BUILD) -b html $(SPHINXOPTS) $(builddir)/html; \
+	else
+	    $(top_srcdir)/build-aux/missing sphinx-build; \
 	fi
 	@mv -f html.tmp $@
 
-dvi:
-	@echo "This target is not supported."
-
-ps:
-	@echo "This target is not supported."
-
 pdf-local:
 	$(MAKE) $(AM_MAKEFLAGS) pdf.stamp
 
 html-local:
 	$(MAKE) $(AM_MAKEFLAGS) html.stamp
 
-install-dvi:
-	@echo "This target is not supported."
-
-install-ps:
-	@echo "This target is not supported."
-
-install-pdf:
-	@echo "This target is not supported. Try \`install-data' instead."
+install-data-local:
+	$(MAKE) -C texinfo install-info; \
 
-install-html:
-	@echo "This target is not supported. Try \`install-data' instead."
+uninstall-data-local:
+	$(MAKE) -C texinfo uninstall-info; \
 
 DISTCLEANFILES = \
     texinfo.stamp \

http://git-wip-us.apache.org/repos/asf/couchdb/blob/b4a59d64/src/couchdb/priv/Makefile.am
----------------------------------------------------------------------
diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am
index 3f5b5c5..6db3557 100644
--- a/src/couchdb/priv/Makefile.am
+++ b/src/couchdb/priv/Makefile.am
@@ -71,7 +71,7 @@ couchjs.1: couchjs
 	    $(HELP2MAN) $(HELP2MAN_OPTION) \
 	        --name="$(package_name) JavaScript interpreter" ./couchjs --output $@; \
 	else \
-	    touch $@; \
+	    $(top_srcdir)/build-aux/missing help2man; \
 	fi
 
 %.cfg: %.cfg.in


Mime
View raw message