couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject git commit: Exclude docs from dist when unable to build
Date Sun, 25 Nov 2012 18:11:25 GMT
Updated Branches:
  refs/heads/docs f4ca7c7de -> 98d4afc1b


Exclude docs from dist when unable to build


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

Branch: refs/heads/docs
Commit: 98d4afc1bb77567ac3db504d8039586746d3be9f
Parents: f4ca7c7
Author: Noah Slater <nslater@apache.org>
Authored: Sun Nov 25 18:11:21 2012 +0000
Committer: Noah Slater <nslater@apache.org>
Committed: Sun Nov 25 18:11:21 2012 +0000

----------------------------------------------------------------------
 bin/Makefile.am              |   10 +++++-----
 share/doc/build/Makefile.am  |   32 +++++++++++++++++++++++++-------
 src/couchdb/priv/Makefile.am |   10 +++++-----
 3 files changed, 35 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/98d4afc1/bin/Makefile.am
----------------------------------------------------------------------
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 25d683a..676651b 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -23,16 +23,16 @@ noinst_SCRIPTS = couchjs_dev couch-config_dev
 man_file = couchdb.1
 
 if BUILD_MAN
-build_man_file = $(man_file)
+man_file_build = $(man_file)
 else
-build_man_file =
+man_file_build =
 endif
 
-BUILT_SOURCES = $(build_man_file)
+BUILT_SOURCES = $(man_file_build)
 
-EXTRA_DIST = $(build_man_file)
+EXTRA_DIST = $(man_file_build)
 
-CLEANFILES = $(bin_SCRIPTS) $(build_man_file) $(noinst_SCRIPTS)
+CLEANFILES = $(bin_SCRIPTS) $(man_file_build) $(noinst_SCRIPTS)
 
 transform = @program_transform_name@
 couchdb_command_name = `echo couchdb | sed '$(transform)'`

http://git-wip-us.apache.org/repos/asf/couchdb/blob/98d4afc1/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index 0c59ccc..dda8a5a 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -61,10 +61,22 @@ info_file_dist = texinfo/CouchDB.info
 
 info_file_inst = CouchDB
 
+if BUILD_INFO
+info_file_build = $(info_file_dist)
+else
+info_file_build =
+endif
+
 pdf_file_dist = latex/CouchDB.pdf
 
 pdf_file_inst = CouchDB.pdf.gz
 
+if BUILD_PDF
+pdf_file_build = $(pdf_file_dist)
+else
+pdf_file_build =
+endif
+
 html_files = \
     html/_images/futon-createdb.png \
     html/_images/futon-editdoc.png \
@@ -122,6 +134,12 @@ html_files = \
     html/searchindex.js \
     html/ssl.html
 
+if BUILD_HTML
+html_file_build = $(html_files)
+else
+html_file_build =
+endif
+
 image_files = \
     ../images/epub-icon.png \
     ../images/futon-createdb.png \
@@ -165,14 +183,14 @@ EXTRA_DIST = \
     ../Makefile.am \
     $(image_files) \
     $(src_files) \
-    $(info_file_dist) \
-    $(pdf_file_dist) \
-    $(html_files)
+    $(info_file_build) \
+    $(pdf_file_build) \
+    $(html_files_build)
 
 BUILT_SOURCES = \
-    $(info_file_dist) \
-    $(pdf_file_dist) \
-    $(html_files)
+    $(info_file_build) \
+    $(pdf_file_build) \
+    $(html_files_build)
 
 $(pdf_file_dist): pdf
 
@@ -193,7 +211,7 @@ info.stamp: $(image_files) $(src_files)
 	$(top_srcdir)/build-aux/sphinx-touch $(info_file_dist)
 	@mv -f info.tmp $@
 
-$(pdf_file): pdf.stamp
+$(pdf_file_dist): pdf.stamp
 	@if test -f $@; then :; else \
 	    rm -f pdf.stamp; \
 	    $(MAKE) $(AM_MAKEFLAGS) pdf.stamp; \

http://git-wip-us.apache.org/repos/asf/couchdb/blob/98d4afc1/src/couchdb/priv/Makefile.am
----------------------------------------------------------------------
diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am
index 02f67eb..a7435fc 100644
--- a/src/couchdb/priv/Makefile.am
+++ b/src/couchdb/priv/Makefile.am
@@ -18,12 +18,12 @@ man1dir = $(mandir)/man1
 man_file = couchjs.1
 
 if BUILD_MAN
-build_man_file = $(man_file)
+man_file_build = $(man_file)
 else
-build_man_file =
+man_file_build =
 endif
 
-BUILT_SOURCES = $(build_man_file)
+BUILT_SOURCES = $(man_file_build)
 
 EXTRA_DIST = \
 	spawnkillable/couchspawnkillable.sh \
@@ -32,9 +32,9 @@ EXTRA_DIST = \
 	couch_js/sm170.c \
 	couch_js/sm180.c \
 	couch_js/sm185.c \
-	$(build_man_file)
+	$(man_file_build)
 
-CLEANFILES = $(build_man_file) stat_descriptions.cfg
+CLEANFILES = $(man_file_build) stat_descriptions.cfg
 
 couchprivlib_LTLIBRARIES = couch_icu_driver.la
 if USE_EJSON_COMPARE_NIF


Mime
View raw message