Tidy up

 - re-organize sources.mk and dependencies.mk
 - remove the non-working groov and gradle
 - minor touch-ups to some Makefiles

5 files changed, 3 insertions, 45 deletions

diff --git a/rules/_generic/Makefile b/rules/_generic/Makefile
index fa5e845..bb2f721 100644
--- a/rules/_generic/Makefile
+++ b/rules/_generic/Makefile
@@ -44,7 +44,7 @@ javac_encoding  := $(firstword $(call pom_get,/project/properties/project.build.
 basedir          = .
 project.basedir  = $(basedir)
 subdirs          = $(patsubst %/pom.xml,%,$(wildcard */pom.xml))
-targets          = pom $(if $(wildcard src/main/ $(sourceDirectory) $(resources)),jar)
+targets          = pom $(if $(wildcard $(sourceDirectory) $(resources)),jar)
 
 # Post-processing
 
diff --git a/rules/groovy/Makefile b/rules/groovy/Makefile
deleted file mode 100644
index d78d19c..0000000
--- a/rules/groovy/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-DESTDIR ?=
-JAR_DIR ?= /usr/share/java
-
-ANTLR2 = $(JAVA) antlr.Tool
-CP = cp
-FAIL = exit 1
-FIND = find
-INSTALL = install
-JAR = jar
-JAVA = java
-JAVAC = javac
-MKDIRS = mkdir -p
-RM = rm -f
-
-dep_dir = $1 $(shell $(FIND) $1 2>/dev/null)
-
-all: PHONY build/groovy.jar
-
-build/generated-sources: $(call dep_dir,src/main)
-	for grammar in $(filter %.g,$^); do $(MKDIRS) $$(dirname $$grammar) && $(ANTLR2) -o $$(dirname $$grammar) $$grammar || { $(RM) -r $@; $(FAIL); }; done
-build/classes: $(call dep_dir,src/main src/resources build/generated-sources)
-	$(RM) -r $@
-	$(MKDIRS) $@
-	$(CP) -a src/main/META-INF $@
-	$(CP) -a src/resources/* $@
-	$(FIND) src/main build/generated-sources -name '*.java' -exec $(JAVAC) -d $@ {} +
-build/groovy.jar: $(call dep_dir,build/classes)
-	$(JAR) -cf $@ -C build/classes .
-
-install: PHONY $(DESTDIR)$(JAR_DIR)/groovy.jar
-
-$(DESTDIR)$(JAR_DIR)/groovy.jar: build/groovy.jar
-	$(INSTALL) -Dm644 $< $@
-
-clean: PHONY
-	$(RM) -r build
-
-.PHONY: PHONY
-.DELETE_ON_ERROR:
-.SECONDARY:
diff --git a/rules/groovy/delete.list b/rules/groovy/delete.list
deleted file mode 100644
index fb2fae2..0000000
--- a/rules/groovy/delete.list
+++ /dev/null
@@ -1,3 +0,0 @@
-gradle/wrapper/gradle-wrapper.jar
-security/GroovyJarTest.jar
-src/test/jars/module-test/module-test/1.2-test/module-test-1.2-test.jar
diff --git a/rules/janino/Makefile b/rules/janino/Makefile
index 042e6f3..3812449 100644
--- a/rules/janino/Makefile
+++ b/rules/janino/Makefile
@@ -29,7 +29,7 @@ janino-dist/build: $(shell $(FIND) . -mindepth 1 $(foreach d,$(ignore),-name $d
 	cd janino-dist && $(ANT) || { $(RM) -r $@; $(FAIL); }
 	$(TOUCH) $@
 janino-dist/build/%.jar: janino-dist/build
-	$(EXISTS) $@ || { $(RM) -r $<; $(FAIL); }
+	$(EXISTS) $@
 	$(TOUCH) $@
 
 .poms/%-$(version).pom: janino-dist/poms/%.pom
diff --git a/rules/maven/Makefile b/rules/maven/Makefile
index 37f546b..199725b 100644
--- a/rules/maven/Makefile
+++ b/rules/maven/Makefile
@@ -22,3 +22,4 @@ bootstrap/target/classes/META-INF/plexus/components.xml: \
     $(call dep_dir,maven-core/src/main/resources/META-INF/plexus) \
     bootstrap/target/classes $(shell $(FIND) bootstrap/target/classes -name '*.class' -o -type d)
 	$(ANT) -Dskip.pull=true process-classes
+.SECONDARY: