diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-06 18:43:10 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-06 18:43:10 -0400 |
| commit | decdab721f2f633c73b7398e4bc64da4130eea90 (patch) | |
| tree | e2f3ef5cb32aa58359911d5dddce7ea0b0fd14a8 | |
| parent | fd28005d9f3f49e2e5dfee2e13aa77eeca961eac (diff) | |
rule/*/Makefile: pull `test -e` into $(EXISTS)
| -rw-r--r-- | rules/atinject-javax.inject/Makefile | 3 | ||||
| -rw-r--r-- | rules/jdom1/Makefile | 3 | ||||
| -rw-r--r-- | rules/jsr305/Makefile | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/rules/atinject-javax.inject/Makefile b/rules/atinject-javax.inject/Makefile index 8abe51f..5c654d2 100644 --- a/rules/atinject-javax.inject/Makefile +++ b/rules/atinject-javax.inject/Makefile @@ -1,6 +1,7 @@ DESTDIR ?= MAVEN_LOCAL_REPO ?= ~/.m2 +EXISTS = test -e FIND = find INSTALL = install RM = rm -f @@ -28,7 +29,7 @@ $(install-dir)/$(artifactId)-$(version).pom: build/maven/pom.xml $(INSTALL) -Dm644 $< $@ $(addprefix build/maven/,$(notdir $(filter-out %.pom,$(install-targets)) pom.xml)): build/maven/%: build - test -e $@ + $(EXISTS) $@ $(TOUCH) $@ clean: PHONY diff --git a/rules/jdom1/Makefile b/rules/jdom1/Makefile index f92bc29..28c0eee 100644 --- a/rules/jdom1/Makefile +++ b/rules/jdom1/Makefile @@ -2,6 +2,7 @@ DESTDIR ?= MAVEN_LOCAL_REPO ?= ~/.m2 ANT = ant +EXISTS = test -e FIND = find INSTALL = install RM = rm -f @@ -23,7 +24,7 @@ install: PHONY $(install-targets) $(foreach target,$(install-targets),$(eval $(target): dist-$$(version)/$(notdir $(target)) ; $$(INSTALL) -Dm644 $$< $$@)) $(addprefix dist-$(version)/,$(notdir $(install-targets))): dist-$(version) - test -e $@ + $(EXISTS) $@ $(TOUCH) $@ clean: PHONY diff --git a/rules/jsr305/Makefile b/rules/jsr305/Makefile index 7ebcb93..9317412 100644 --- a/rules/jsr305/Makefile +++ b/rules/jsr305/Makefile @@ -2,6 +2,7 @@ DESTDIR ?= JAR_DIR ?= /usr/share/java ANT = ant +EXISTS = test -e FIND = find INSTALL = install RM = rm -f @@ -12,7 +13,6 @@ all: PHONY build build: src $(shell $(FIND) src) $(ANT) jars || { $(RM) -r build; exit 1; } $(TOUCH) $@ -build/%: build install-dir = $(DESTDIR)$(JAR_DIR)/jsr305 install-targets = $(addprefix $(install-dir)/jsr305,.jar -pure.jar -src.jar) @@ -22,7 +22,7 @@ $(install-targets): $(install-dir)/%: build/% $(INSTALL) -Dm644 $< $@ $(patsubst $(install-dir)/%,build/%,$(install-targets)): build/%: build - test -e $@ + $(EXISTS) $@ $(TOUCH) $@ clean: PHONY |