summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-06-07 11:55:19 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-06-07 11:55:19 -0400
commit519d2138edf8fceadc09a58dc6b20a022152bb8a (patch)
treee54446862afa0ce582cf3c1fa24102233f3e459f /rules
parentb37ee8ec5cd65daac932a70b6f507e51353e9d56 (diff)
rules/*/Makefile: pull `exit ` into $(FAIL)
Diffstat (limited to 'rules')
-rw-r--r--rules/atinject-javax.inject/Makefile3
-rw-r--r--rules/generic/Makefile3
-rw-r--r--rules/jdom1/Makefile3
-rw-r--r--rules/jflex/Makefile3
-rw-r--r--rules/jsr305/Makefile3
5 files changed, 10 insertions, 5 deletions
diff --git a/rules/atinject-javax.inject/Makefile b/rules/atinject-javax.inject/Makefile
index 5c654d2..69e45bb 100644
--- a/rules/atinject-javax.inject/Makefile
+++ b/rules/atinject-javax.inject/Makefile
@@ -2,6 +2,7 @@ DESTDIR ?=
MAVEN_LOCAL_REPO ?= ~/.m2
EXISTS = test -e
+FAIL = exit 1
FIND = find
INSTALL = install
RM = rm -f
@@ -16,7 +17,7 @@ groupId := $(shell $(XMLSTARLET) sel -T -t -c /_:project/_:groupId -n pom
all: PHONY build
build: $(shell $(FIND) src)
- $(SED) -e 's/VERSION=.*/VERSION=$(version)/' -e /tck/d -e /junit/d build.sh | $(SHELL) || { $(RM) -r $@; exit 1; }
+ $(SED) -e 's/VERSION=.*/VERSION=$(version)/' -e /tck/d -e /junit/d build.sh | $(SHELL) || { $(RM) -r $@; $(FAIL); }
$(TOUCH) $@
install-dir = $(DESTDIR)$(MAVEN_LOCAL_REPO)/$(subst .,/,$(groupId))/$(artifactId)/$(version)
diff --git a/rules/generic/Makefile b/rules/generic/Makefile
index c54d714..b80fc50 100644
--- a/rules/generic/Makefile
+++ b/rules/generic/Makefile
@@ -6,6 +6,7 @@ MAVEN_LOCAL_REPO ?= ~/.m2
# Utilities
XMLSTARLET = xml
+FAIL = exit 1
FIND = find
JAVAC = javac
INSTALL = install
@@ -68,7 +69,7 @@ target/META-INF/maven/$(groupId)/$(artifactId)/pom.properties: pom.xml
target/classes: $(call dep_optdir,$(sourceDirectory))
$(MKDIRS) $@
- @echo JAVAC; $(if $^,$(JAVAC) -d $@ $(filter %.java,$^) || { $(RM) -r $@; exit 1; })
+ @echo $(JAVAC) -d $@ ...; $(if $^,$(JAVAC) -d $@ $(filter %.java,$^) || { $(RM) -r $@; $(FAIL); })
# install
diff --git a/rules/jdom1/Makefile b/rules/jdom1/Makefile
index 28c0eee..f147673 100644
--- a/rules/jdom1/Makefile
+++ b/rules/jdom1/Makefile
@@ -3,6 +3,7 @@ MAVEN_LOCAL_REPO ?= ~/.m2
ANT = ant
EXISTS = test -e
+FAIL = exit 1
FIND = find
INSTALL = install
RM = rm -f
@@ -15,7 +16,7 @@ groupId = org.jdom
all: PHONY dist-$(version)
dist-$(version): $(shell $(FIND) core contrib test -mindepth 1 \( -name build -o -name tmp \) -prune -o -print)
- $(ANT) -Dgpg=echo -Dversion=$(version) maven || { $(RM) -r $@ */build; exit 1; }
+ $(ANT) -Dgpg=echo -Dversion=$(version) maven || { $(RM) -r $@ */build; $(FAIL); }
$(TOUCH) $@
install-dir = $(DESTDIR)$(MAVEN_LOCAL_REPO)/$(subst .,/,$(groupId))/$(artifactId)/$(version)
diff --git a/rules/jflex/Makefile b/rules/jflex/Makefile
index dcac8b2..1aadb5a 100644
--- a/rules/jflex/Makefile
+++ b/rules/jflex/Makefile
@@ -5,6 +5,7 @@ EMACSDIR ?= /usr/share/emacs/site-lisp
ANT = ant
EXISTS = test -e
+FAIL = exit 1
FIND = find
INSTALL = install
RM = rm -f
@@ -33,7 +34,7 @@ antflags += -Djunit.jar='$(junit_jar)'
all: PHONY build
build: $(shell $(FIND) src/main) $(wildcard jflex2jlex.*) build.xml
- $(ANT) $(antflags) build || { $(RM) -r $@; exit 1; }
+ $(ANT) $(antflags) build || { $(RM) -r $@; $(FAIL); }
$(TOUCH) $@
install-base = $(DESTDIR)$(MAVEN_LOCAL_REPO)/$(subst .,/,$(groupId))/$(artifactId)/$(version)/$(artifactId)-$(version)
diff --git a/rules/jsr305/Makefile b/rules/jsr305/Makefile
index b45641f..f84cc6b 100644
--- a/rules/jsr305/Makefile
+++ b/rules/jsr305/Makefile
@@ -3,6 +3,7 @@ JAR_DIR ?= /usr/share/java
ANT = ant
EXISTS = test -e
+FAIL = exit 1
FIND = find
INSTALL = install
RM = rm -f
@@ -11,7 +12,7 @@ TOUCH = touch
all: PHONY build
build: $(shell $(FIND) src)
- $(ANT) jars || { $(RM) -r build; exit 1; }
+ $(ANT) jars || { $(RM) -r build; $(FAIL); }
$(TOUCH) $@
install-dir = $(DESTDIR)$(JAR_DIR)/jsr305