diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-10 15:07:34 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-10 15:07:34 -0400 |
| commit | ade6c745754cc984f06ff1fa2399f1eda2db6d64 (patch) | |
| tree | e00623c3dce57bccc21395e59f2203483d55198b | |
| parent | b514cfa2ce91d20813768d7ad19bcecc14da2f6f (diff) | |
fix
| -rw-r--r-- | rules/generic/Makefile | 8 | ||||
| -rw-r--r-- | rules/qdox/generated-sources.mk | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/rules/generic/Makefile b/rules/generic/Makefile index 25a5075..e42adb9 100644 --- a/rules/generic/Makefile +++ b/rules/generic/Makefile @@ -30,11 +30,15 @@ sourceDirectory := $(firstword $(shell $(XMLSTARLET) sel -T -t -c /_:project/_:b resources := $(shell $(XMLSTARLET) sel -T -t -c /_:project/_:build/_:resources -n pom.xml) resources := $(if $(resources),$(resources),src/main/resources) +basedir := $(shell pwd) subdirs = $(patsubst %/pom.xml,%,$(wildcard */pom.xml)) targets = pom $(if $(wildcard src/main/ $(sourceDirectory) $(resources)),jar) $(if $(extra_makefiles),$(eval include $(extra_makefiles))) +subdirs := $(subdirs) +targets := $(targets) + ################################################################################ dep_dir = $1 $(shell $(FIND) $1 2>/dev/null) @@ -52,7 +56,9 @@ target/generated-sources: # generate-resources ########################################################### -target/generated-resources: $(addpreffix target/generated-resources/META-INF/maven/$(groupId)/$(artifactId)/pom,.properties .xml) +target/generated-resources: \ + target/generated-resources/META-INF/maven/$(groupId)/$(artifactId)/pom.properties \ + target/generated-resources/META-INF/maven/$(groupId)/$(artifactId)/pom.xml for dep in $^; do $(EXISTS) $$dep || { $(RM) -r $@; $(FAIL); }; done $(TOUCH) $@ diff --git a/rules/qdox/generated-sources.mk b/rules/qdox/generated-sources.mk index 56a277c..078e74d 100644 --- a/rules/qdox/generated-sources.mk +++ b/rules/qdox/generated-sources.mk @@ -1,9 +1,7 @@ BYACCJ = byaccj -JAVA = java JFLEX = $(JAVA) -jar $(call jarfind,jflex) qdox.javaparser.stack = 500 -basedir = $(shell pwd) jarfind = $(firstword $(foreach path,$(subst :, ,$(CLASSPATH)),$(if $(findstring $1,$(path)),$(path)))) parserpkg = com.thoughtworks.qdox.parser.impl parserdir = target/generated-sources/parser/$(subst .,/,$(parserpkg)) |