Tidy up

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

7 files changed, 135 insertions, 173 deletions

diff --git a/conf/dependencies.mk b/conf/dependencies.mk
index bb78be0..716e95b 100644
--- a/conf/dependencies.mk
+++ b/conf/dependencies.mk
@@ -1,5 +1,5 @@
 # What is needed to use the Modello command line
-dep-modello-cli = \
+dep-meta-modello-cli = \
 	build/packages/guava \
 	build/packages/modello-core \
 	build/packages/plexus-build-api \
@@ -8,7 +8,7 @@ dep-modello-cli = \
 	build/packages/plexus-utils \
 	build/packages/xbean-bootstrap
 # What is needed to use the Plexus Metadata Generator command line
-dep-plexus-metadata-generator-cli = \
+dep-meta-plexus-metadata-generator-cli = \
 	build/packages/commons-cli \
 	build/packages/guava \
 	build/packages/jdom1 \
@@ -21,30 +21,30 @@ dep-plexus-metadata-generator-cli = \
 	build/packages/qdox \
 	build/packages/xbean-bootstrap
 # Where is xerces2?
-dep-xerces2 = \
+dep-meta-xerces2 = \
 	/usr/share/java/serializer.jar \
 	/usr/share/java/xercesImpl.jar \
 	/usr/share/java/xml-apis.jar
-# Where is junit?
-dep-junit = /usr/share/java/junit.jar
 
-# Implementations of standards
-dep-jsr305 = build/packages/jsr305                # "Annotations for Software Defect Detection"
-dep-jsr315 = $(dep-servlet30)                     # "Java Servlet 3.0 Specification"
-dep-jsr330 = build/packages/atinject-javax.inject # "Dependency Injection for Java"
-dep-jsr340 = $(dep-servlet31)                     # "Java Servlet 3.1 Specification"
+# Implementations (or at least APIs) of standards
+dep-std-jsr305 = build/packages/jsr305                # "Annotations for Software Defect Detection"
+dep-std-jsr315 = $(dep-std-servlet30)                 # "Java Servlet 3.0 Specification"
+dep-std-jsr330 = build/packages/atinject-javax.inject # "Dependency Injection for Java"
+dep-std-jsr340 = $(dep-std-servlet31)                 # "Java Servlet 3.1 Specification"
 
-dep-jpa10 = $(dep-jpa20)
-dep-jpa20 = build/packages/eclipselink-persistence20
-dep-jpa21 = build/packages/eclipselink-persistence21
+dep-std-jpa10 = $(dep-std-jpa20)
+dep-std-jpa20 = build/packages/eclipselink-persistence20
+dep-std-jpa21 = build/packages/eclipselink-persistence21
 
-dep-servlet25 = /usr/share/java/tomcat6/servlet-api.jar
-dep-servlet30 = /usr/share/java/tomcat7/servlet-api.jar
-dep-servlet31 = /usr/share/java/tomcat8/servlet-api.jar
+dep-std-servlet25 = /usr/share/java/tomcat6/servlet-api.jar
+dep-std-servlet30 = /usr/share/java/tomcat7/servlet-api.jar
+dep-std-servlet31 = /usr/share/java/tomcat8/servlet-api.jar
+
+dep-std-javamail = /usr/share/java/gnumail.jar
 
 ################################################################################
 
-# Apache
+# Apache (from tarballs)
 
 build/packages/httpcomponents-core: \
 	build/packages/commons-cli
@@ -54,14 +54,20 @@ build/packages/httpcomponents-client-bootstrap: \
 	build/packages/httpcomponents-core
 
 build/packages/maven: \
-	$(dep-modello-cli) \
-	$(dep-plexus-metadata-generator-cli) \
-	$(dep-jsr330) \
-	build/packages/aether-core-bootstrap \
-	build/packages/guice-core \
+	$(dep-meta-modello-cli) \
+	$(dep-meta-plexus-metadata-generator-cli) \
+	$(dep-std-jsr330) \
+	build/packages/aether-core \
+	build/packages/guice-bootstrap \
+	build/packages/logback-core \
 	build/packages/modello-plugins \
+	build/packages/plexus-cipher \
 	build/packages/plexus-component-annotations \
+	build/packages/plexus-container-default \
 	build/packages/plexus-interpolation \
+	build/packages/plexus-sec-dispatcher \
+	build/packages/sisu-plexus \
+	build/packages/slf4j-api \
 	build/packages/wagon
 build/packages/maven-artifact-bootstrap: \
 	build/packages/plexus-utils
@@ -72,18 +78,19 @@ build/packages/maven-plugin-api-bootstrap: \
 	build/packages/plexus-utils
 
 build/packages/mina: \
+	/usr/share/java/rxtx/RXTXcomm.jar \
+	/usr/share/java/tomcat8/tomcat-jni.jar \
 	build/packages/commons-lang2 \
 	build/packages/jzlib \
 	build/packages/ognl \
-	build/packages/slf4j-api \
-	/usr/share/java/rxtx/RXTXcomm.jar \
-	/usr/share/java/tomcat8/tomcat-jni.jar
+	build/packages/slf4j-api
 build/packages/mina-sshd: \
+	/usr/share/java/tomcat8/tomcat-jni.jar \
 	build/packages/jzlib \
 	build/packages/mina \
-	build/packages/slf4j-api \
-	/usr/share/java/tomcat8/tomcat-jni.jar
+	build/packages/slf4j-api
 
+# Apache (from SVN)
 build/packages/maven-plugin-annotations-bootstrap: \
 	build/packages/maven-artifact-bootstrap
 build/packages/maven-plugin-tools-api-bootstrap: \
@@ -91,7 +98,6 @@ build/packages/maven-plugin-tools-api-bootstrap: \
 	build/packages/maven-plugin-api-bootstrap \
 	build/packages/plexus-container-default \
 	build/packages/plexus-utils
-
 build/packages/xbean-bootstrap: \
 	build/packages/asm3 \
 	build/packages/commons-logging-bootstrap \
@@ -99,7 +105,6 @@ build/packages/xbean-bootstrap: \
 	build/packages/slf4j-api
 
 # Modello
-
 build/packages/modello-core: \
 	build/packages/plexus-build-api \
 	build/packages/plexus-container-default \
@@ -111,12 +116,11 @@ build/packages/modello-plugins: \
 	build/packages/plexus-utils
 
 # Plexus
-
 build/packages/plexus-build-api: \
 	build/packages/plexus-container-default \
 	build/packages/plexus-utils
 build/packages/plexus-cipher: \
-	$(dep-jsr330)
+	$(dep-std-jsr330)
 build/packages/plexus-cli: \
 	build/packages/commons-cli \
 	build/packages/plexus-classworlds \
@@ -126,11 +130,10 @@ build/packages/plexus-interactivity: \
 	build/packages/plexus-container-default \
 	build/packages/plexus-utils
 build/packages/plexus-sec-dispatcher: \
-	$(dep-modello-cli) \
+	$(dep-meta-modello-cli) \
 	build/packages/modello-plugins \
 	build/packages/plexus-cipher \
 	build/packages/plexus-container-default
-
 build/packages/plexus-component-metadata-bootstrap: \
 	build/packages/asm3 \
 	build/packages/commons-cli \
@@ -143,14 +146,17 @@ build/packages/plexus-component-metadata-bootstrap: \
 	build/packages/plexus-utils \
 	build/packages/qdox
 build/packages/plexus-container-default: \
-	$(dep-junit) \
+	/usr/share/java/junit.jar \
 	build/packages/guava \
 	build/packages/plexus-classworlds \
 	build/packages/plexus-utils \
 	build/packages/xbean-bootstrap
 
 # OSGi
-build/packages/osgi50-enterprise: build/packages/osgi50-core $(dep-servlet31) $(dep-jpa21)
+build/packages/osgi50-enterprise: \
+	$(dep-std-jpa21) \
+	$(dep-std-servlet31) \
+	build/packages/osgi50-core
 
 # ASM
 build/packages/ow-util-ant-tasks: build/packages/asm2
@@ -160,8 +166,17 @@ build/packages/asm3: build/packages/ow-util-ant-tasks
 build/packages/asm4: build/packages/ow-util-ant-tasks build/packages/bnd
 build/packages/asm5: build/packages/ow-util-ant-tasks build/packages/bnd
 
-# Misc
+# Quality Open Software
+build/packages/logback-core: \
+	$(dep-std-javamail) \
+	$(dep-std-servlet25) \
+	build/packages/janino \
+	build/packages/jansi
+build/packages/cal10n: \
+	build/packages/maven-artifact-bootstrap \
+	build/packages/maven-plugin-api-bootstrap
 
+# Eclipse
 build/packages/aether-core: \
 	build/packages/guice-bootstrap \
 	build/packages/httpcomponents-client-bootstrap \
@@ -173,44 +188,59 @@ build/packages/aether-core: \
 	build/packages/sisu-inject-bootstrap \
 	build/packages/slf4j-api \
 	build/packages/wagon
+build/packages/eclipselink-persistence20: \
+	build/packages/osgi50-core # any version would probably work
+build/packages/eclipselink-persistence21: \
+	build/packages/osgi50-core # any version would probably work
+build/packages/sisu-inject-bootstrap: \
+	/usr/share/java/junit.jar \
+	$(dep-std-servlet25) \
+	build/packages/guice-bootstrap \
+	build/packages/osgi50-core \
+	build/packages/slf4j-api
+build/packages/sisu-plexus: \
+	/usr/share/java/junit.jar \
+	$(dep-std-jsr330) \
+	build/packages/guice-bootstrap \
+	build/packages/osgi50-core \
+	build/packages/plexus-classworlds \
+	build/packages/plexus-component-annotations \
+	build/packages/plexus-utils \
+	build/packages/sisu-inject-bootstrap \
+	build/packages/slf4j-api
+
+# FuseSource
+build/packages/jansi: \
+	build/packages/jansi-native
+build/packages/jansi-native: \
+	build/packages/hawtjni-bootstrap
+build/packages/hawtjni-bootstrap: \
+	build/packages/commons-cli \
+	build/packages/xbean-bootstrap
+
+# Misc (from tarballs)
 build/packages/bnd: \
-	$(dep-junit) \
+	/opt/apache-ant/lib/ant.jar \
+	/usr/share/java/junit.jar \
 	build/packages/osgi50-core \
-	build/packages/osgi50-enterprise \
-	/opt/apache-ant/lib/ant.jar
-build/packages/cal10n: \
-	build/packages/maven-artifact-bootstrap \
-	build/packages/maven-plugin-api-bootstrap
+	build/packages/osgi50-enterprise
 build/packages/cglib: \
 	build/packages/asm4 \
 	build/packages/jarjar
-build/packages/guava: \
-	$(dep-jsr305)
 build/packages/guice-bootstrap: \
-	$(dep-jsr330) \
-	$(dep-jpa10) \
-	$(dep-servlet25) \
+	$(dep-std-jsr330) \
+	$(dep-std-jpa10) \
+	$(dep-std-servlet25) \
 	build/packages/aopalliance \
 	build/packages/asm3 \
 	build/packages/cglib
-build/packages/groovy: \
-	build/packages/asm5 \
-	build/packages/commons-cli \
-	build/packages/jansi \
-	build/packages/xstream \
-	/usr/share/java/antlr2.jar
-build/packages/logback-core: \
-	$(dep-javamail) \
-	$(dep-servlet25) \
-	build/packages/janino \
-	build/packages/jansi
 build/packages/ognl: \
-	build/packages/javassist \
-	/usr/share/java/javacc.jar
+	/usr/share/java/javacc.jar \
+	build/packages/javassist
 build/packages/qdox: \
 	build/packages/jflex
 build/packages/wagon: \
-	$(dep-junit) \
+	/usr/share/java/junit.jar \
 	build/packages/commons-io \
 	build/packages/commons-lang2 \
 	build/packages/commons-net \
@@ -219,53 +249,31 @@ build/packages/wagon: \
 	build/packages/jsoup \
 	build/packages/plexus-interactivity \
 	build/packages/plexus-utils
-build/packages/janino: \
-	/opt/apache-ant/lib/ant.jar
+
+# Misc (from VCS)
+build/packages/guava: \
+	$(dep-std-jsr305)
 build/packages/jarjar: \
 	build/packages/asm4 \
 	build/packages/maven-plugin-api-bootstrap
 
-build/packages/jansi: \
-	build/packages/jansi-native
-build/packages/jansi-native: \
-	build/packages/hawtjni-bootstrap
-build/packages/hawtjni-bootstrap: \
-	build/packages/commons-cli \
-	build/packages/xbean-bootstrap
+# Misc individual things I decided to give multiple lines to in sources.mk
 
-build/packages/eclipselink-persistence20: \
-	build/packages/osgi50-core # any version would probably work
-build/packages/eclipselink-persistence21: \
-	build/packages/osgi50-core # any version would probably work
-build/packages/sisu-inject-bootstrap: \
-	$(dep-junit) \
-	$(dep-servlet25) \
-	build/packages/guice-bootstrap \
-	build/packages/osgi50-core \
-	build/packages/slf4j-api
-build/packages/sisu-plexus: \
-	$(dep-junit) \
-	$(dep-jsr330) \
-	build/packages/guice-bootstrap \
-	build/packages/osgi50-core \
-	build/packages/plexus-classworlds \
-	build/packages/plexus-component-annotations \
-	build/packages/plexus-utils \
-	build/packages/sisu-inject-bootstrap \
-	build/packages/slf4j-api
+build/packages/janino: \
+	/opt/apache-ant/lib/ant.jar
 
 # JDOM/Jaxen
 build/packages/jdom1: \
 	build/packages/jaxen-bootstrap \
-	$(dep-xerces2)
+	$(dep-meta-xerces2)
 build/packages/jaxen-bootstrap: \
 	build/packages/jdom1-bootstrap
 build/packages/jdom1-bootstrap: \
-	$(dep-xerces2)
+	$(dep-meta-xerces2)
 
 # JFlex
 build/packages/jflex: \
-	$(dep-junit) \
+	/usr/share/java/junit.jar \
 	build/packages/jflex-bootstrap
 build/packages/jflex-bootstrap: \
-	$(dep-junit)
+	/usr/share/java/junit.jar
diff --git a/conf/sources.mk b/conf/sources.mk
index fae9077..f7dfd81 100644
--- a/conf/sources.mk
+++ b/conf/sources.mk
@@ -5,16 +5,17 @@ _objectweb_mirror                           =  http://download.forge.objectweb.o
 _tarbombs =
 
 # Apache tarballs
+
 commons-cli                                 =  tar|$(_apache_mirror)/commons/cli/source/commons-cli-1.2-src.tar.gz
-commons-io                                  =  tar|$(_apache_mirror)/commons/io/source/commons-io-2.4-src.tar.gz
 commons-codec                               =  tar|$(_apache_mirror)/commons/codec/source/commons-codec-1.9-src.tar.gz
+commons-io                                  =  tar|$(_apache_mirror)/commons/io/source/commons-io-2.4-src.tar.gz
 commons-lang2                               =  tar|$(_apache_mirror)/commons/lang/source/commons-lang-2.6-src.tar.gz
 commons-logging                             =  tar|$(_apache_mirror)/commons/logging/source/commons-logging-1.2-src.tar.gz
 commons-logging-bootstrap                   =  $(commons-logging)
 commons-net                                 =  tar|$(_apache_mirror)/commons/net/source/commons-net-3.3-src.tar.gz
 
-httpcomponents-client-bootstrap             =  tar|$(_apache_mirror)/httpcomponents/httpclient/source/httpcomponents-client-4.3.4-src.tar.gz
 httpcomponents-core                         =  tar|$(_apache_mirror)/httpcomponents/httpcore/source/httpcomponents-core-4.3.2-src.tar.gz
+httpcomponents-client-bootstrap             =  tar|$(_apache_mirror)/httpcomponents/httpclient/source/httpcomponents-client-4.3.4-src.tar.gz
 
 maven                                       =  tar|$(_apache_mirror)/maven/maven-3/3.2.1/source/apache-maven-3.2.1-src.tar.gz
 maven-artifact-bootstrap                    =  tar|$(_apache_mirror)/maven/maven-3/3.2.1/source/apache-maven-3.2.1-src.tar.gz|maven-artifact
@@ -75,12 +76,27 @@ ow-util-ant-tasks                           =  tar|$(_objectweb_mirror)/monolog/
 ow-util-ant-tasks-bootstrap                 =  $(ow-util-ant-tasks)
 _tarbombs += $(ow-util-ant-tasks)
 
+# Quality Open Software
+logback-core                                =  tar|http://logback.qos.ch/dist/logback-1.1.2.tar.gz|logback-core # HTTPS is mis-configured
+cal10n                                      =  tar|https://github.com/qos-ch/cal10n/archive/v_0.8.1.tar.gz
+slf4j-api                                   =  tar|http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz|slf4j-api # HTTPS is mis-configured
+
+# Eclipse
+aether-core                                 =  tar|https://git.eclipse.org/c/aether/aether-core.git/snapshot/aether-1.0.0.v20140518.tar.gz
+eclipselink-persistence20                   =  tar|https://git.eclipse.org/c/eclipselink/javax.persistence.git/snapshot/javax.persistence-2.0.6.v201308211412.tar.gz
+eclipselink-persistence21                   =  tar|https://git.eclipse.org/c/eclipselink/javax.persistence.git/snapshot/javax.persistence-2.1.0.v201304241213.tar.gz
+sisu-inject-bootstrap                       =  tar|https://git.eclipse.org/c/sisu/org.eclipse.sisu.inject.git/snapshot/releases/0.2.1.tar.gz|0.2.1
+sisu-plexus                                 =  tar|https://git.eclipse.org/c/sisu/org.eclipse.sisu.plexus.git/snapshot/releases/0.2.1.tar.gz|0.2.1
+
+# FuseSource
+jansi                                       =  tar|https://github.com/fusesource/jansi/archive/jansi-project-1.11.tar.gz
+jansi-native                                =  tar|https://github.com/fusesource/jansi-native/archive/jansi-native-1.5.tar.gz
+hawtjni-bootstrap                           =  tar|https://github.com/fusesource/hawtjni/archive/hawtjni-project-1.10.tar.gz
+
 # Misc tarballs
 aopalliance                                 =  tar|http://aopalliance.cvs.sourceforge.net/viewvc/aopalliance/aopalliance/?view=tar
 bnd                                         =  tar|https://github.com/bndtools/bnd/archive/2.3.0.REL.tar.gz
 cglib                                       =  tar|https://github.com/cglib/cglib/archive/RELEASE_3_1.tar.gz
-gradle                                      =  tar|https://services.gradle.org/distributions/gradle-1.12-src.zip
-groovy                                      =  tar|https://dl.bintray.com/groovy/maven/groovy-src-2.3.3.zip
 guice-bootstrap                             =  tar|https://google-guice.googlecode.com/files/guice-3.0-src.zip
 #javacc                                      =  tar|https://java.net/projects/javacc/downloads/download/javacc-6.0src.zip
 javassist                                   =  tar|https://github.com/jboss-javassist/javassist/archive/rel_3_18_2_ga.tar.gz
@@ -90,45 +106,25 @@ ognl                                        =  tar|https://github.com/jkuhnert/o
 qdox                                        =  tar|https://nexus.codehaus.org/content/repositories/releases/com/thoughtworks/qdox/qdox/2.0-M1/qdox-2.0-M1-project.tar.bz2
 wagon                                       =  tar|$(_apache_mirror)/maven/wagon/wagon-2.6-source-release.zip
 
-# Janino
-_janino-part1                               =  svn|https://svn.codehaus.org/janino|tags/janino_2.7.5
-_janino-part2                               =  svn|https://svn.code.sf.net/p/loggifier/code|tags/janino_2.7.5
-janino                                      =  union|_janino-part1:_janino-part2
-
-# Quality Open Software
-logback-core                                =  tar|http://logback.qos.ch/dist/logback-1.1.2.tar.gz|logback-core # HTTPS is mis-configured
-cal10n                                      =  tar|https://github.com/qos-ch/cal10n/archive/v_0.8.1.tar.gz
-slf4j-api                                   =  tar|http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz|slf4j-api # HTTPS is mis-configured
-
-eclipselink-persistence20                   =  tar|https://git.eclipse.org/c/eclipselink/javax.persistence.git/snapshot/javax.persistence-2.0.6.v201308211412.tar.gz
-eclipselink-persistence21                   =  tar|https://git.eclipse.org/c/eclipselink/javax.persistence.git/snapshot/javax.persistence-2.1.0.v201304241213.tar.gz
-sisu-inject-bootstrap                       =  tar|https://git.eclipse.org/c/sisu/org.eclipse.sisu.inject.git/snapshot/releases/0.2.1.tar.gz|0.2.1
-sisu-plexus                                 =  tar|https://git.eclipse.org/c/sisu/org.eclipse.sisu.plexus.git/snapshot/releases/0.2.1.tar.gz|0.2.1
-
-# Misc Git
-aether-core                                 =  git|git://git.eclipse.org/gitroot/aether/aether-core.git|aether-1.0.0.v20140518
+# Misc VCS
+atinject-javax.inject                       =  svn|https://atinject.googlecode.com/svn|trunk
 bouncycastle-java                           =  git|http://git.bouncycastle.org/repositories/bc-java|r1rv50 # SSL is broken
 guava                                       =  git|https://code.google.com/p/guava-libraries/|v17.0/guava
-jsoup                                       =  git|git://github.com/jhy/jsoup.git|jsoup-1.7.3
 jarjar                                      =  svn|https://jarjar.googlecode.com/svn|trunk/jarjar
+jsoup                                       =  git|git://github.com/jhy/jsoup.git|jsoup-1.7.3
+jsr305                                      =  svn|https://jsr-305.googlecode.com/svn|trunk/ri
 
-# FuseSource
-jansi                                       =  tar|https://github.com/fusesource/jansi/archive/jansi-project-1.11.tar.gz
-jansi-native                                =  tar|https://github.com/fusesource/jansi-native/archive/jansi-native-1.5.tar.gz
-hawtjni                                     =  tar|https://github.com/fusesource/hawtjni/archive/hawtjni-project-1.10.tar.gz
-hawtjni-bootstrap                           =  $(hawtjni)
+# Misc individual things I decided to give multiple lines to
 
-# Is missing support for jom4j and xom
-jaxen-bootstrap                             =  tar|http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.6-src.tar.gz # HTTPS is broken
+_janino-part1                               =  svn|https://svn.codehaus.org/janino|tags/janino_2.7.5
+_janino-part2                               =  svn|https://svn.code.sf.net/p/loggifier/code|tags/janino_2.7.5
+janino                                      =  union|_janino-part1:_janino-part2
 
+# Jaxen is used to bootstrap jdom1
 jdom1                                       =  tar|https://github.com/hunterhacker/jdom/archive/jdom-1.1.3.tar.gz
 jdom1-bootstrap                             =  $(jdom1)
+jaxen-bootstrap                             =  tar|http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.6-src.tar.gz # HTTPS is broken
 
 jflex                                       =  tar|http://jflex.de/jflex-1.5.1.tar.gz # No TLS
 jflex-bootstrap                             =  $(jflex)
 
-# Any other implementation of JSR-305 would probably be fine too.
-jsr305                                      =  svn|https://jsr-305.googlecode.com/svn|trunk/ri
-
-# An implementation of JSR-330.  Google Guice also implements JSR-330.
-atinject-javax.inject                       =  svn|https://atinject.googlecode.com/svn|trunk
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: