Mike Gerwitz

Activist for User Freedom

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Gerwitz <mike.gerwitz@rtspecialty.com>2018-02-23 12:24:14 -0500
committerMike Gerwitz <mike.gerwitz@rtspecialty.com>2018-02-23 12:24:14 -0500
commitb490d0737140919549fb1eb0a3650f8d0e9c0a54 (patch)
tree8723579597a283231cecd2d961bb6dae633c347e
parentd1aa5f5704a3298a7bb6ce3636d92c00f0acf8fe (diff)
downloadtame-b490d0737140919549fb1eb0a3650f8d0e9c0a54.tar.gz
tame-b490d0737140919549fb1eb0a3650f8d0e9c0a54.tar.bz2
tame-b490d0737140919549fb1eb0a3650f8d0e9c0a54.zip
Makefile.am: Prevent doc from being built by defaultv2.9.13
-rw-r--r--Makefile.am14
-rw-r--r--configure.ac3
-rw-r--r--progtest/Makefile2
3 files changed, 12 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 290fdfe..3546e5c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
##
-SUBDIRS = doc
+SUBDIRS = doc progtest
path_src = src
path_test = test
@@ -35,13 +35,9 @@ export SAXON_CP
.PHONY: check test texis applies FORCE
-.DEFAULT_GOAL := all
+.DEFAULT_GOAL = all-nodoc
-all: applies progtest
-
-test: check
-check: | applies
- $(path_test)/runner
+all-nodoc: applies progtest
# the "applies" are hoxsl-generated stylesheets containing definitions to
# permit partial function application
@@ -51,6 +47,10 @@ applies: $(apply_dest)
-xsl:"$(HOXSL)/src/transform/apply-gen.xsl" \
"$<" > "$@"
+test: check
+check: | applies
+ $(path_test)/runner
+
progtest: FORCE
$(MAKE) -C progtest
diff --git a/configure.ac b/configure.ac
index 9eef527..a8db59f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,9 @@ AC_INIT([tame], [ver], [dev@lovullo.com])
AC_CONFIG_AUX_DIR([tools])
AM_INIT_AUTOMAKE([foreign])
+# target that should be be added to everything except doc/
+AM_EXTRA_RECURSIVE_TARGETS([all-nodoc])
+
# provide more granular version numbers based on the version string, using
# the format MAJOR.MINOR.REV[-SUFFIX], where SUFFIX can itself contain
# dashes (and often will)
diff --git a/progtest/Makefile b/progtest/Makefile
index 72dbfa4..1365ed2 100644
--- a/progtest/Makefile
+++ b/progtest/Makefile
@@ -24,6 +24,8 @@ nsindex=$(addsuffix /index.js, $(namespaces))
.DEFAULT_GOAL: all
+# used be parent Makefile to prevent doc/ building `all'
+all-nodoc: all
all: tame-progtest.js
test: check