Re-arrange the directories to keep everything for a package together

15 files changed, 11 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index fcbfb45..3d6dc07 100644
--- a/Makefile
+++ b/Makefile
@@ -89,11 +89,11 @@ build/workdir/%:
 	mkdir -p '$(@D)'
 	cp -a '$<' '$@'
 	cd '$@' && \
-	for patch in $(wildcard $(top)/patches/$*/*); do \
+	for patch in $(wildcard $(top)/rules/$*/*.patch); do \
 		patch -f -Np1 -i $$patch || { rm -rf '$@'; exit 1; }; \
 	done && \
-	if [ -f '$(top)/delete/$*.txt' ]; then \
-		rm -rf -- $$(< '$(top)/delete/$*.txt'); \
+	if [ -f '$(top)/rules/$*/delete.list' ]; then \
+		rm -rf -- $$(< '$(top)/rules/$*/delete.list'); \
 	fi
 
 # Loop over our source configuration and set up the dependencies
@@ -107,24 +107,24 @@ $(foreach package,$(packages),$(eval \
 
 package: PHONY $(addprefix build/packages/,$(packages))
 
-package_specific=$(filter     $(patsubst makefiles/%.mk,%,$(wildcard makefiles/*.mk)),$(packages))
-package_generic =$(filter-out $(patsubst makefiles/%.mk,%,$(wildcard makefiles/*.mk)),$(packages))
+package_specific=$(filter     $(patsubst rules/%/Makefile,%,$(wildcard rules/*/Makefile)),$(packages))
+package_generic =$(filter-out $(patsubst rules/%/Makefile,%,$(wildcard rules/*/Makefile)),$(packages))
 
 dirs2jars = $(if $1,$(shell find $1 -name '*.jar'))
 deps2jars = $(filter %.jar,$1) $(call dirs2jars,$(filter build/packages/%,$1))
 deps2classpath = $(shell echo $(abspath $(call deps2jars,$1)) | tr ' ' :)
 
 $(addprefix build/packages/,$(package_specific)): \
-build/packages/%: RECURSIVE build/workdir/% makefiles/%.mk
-	$(MAKE) -C build/workdir/$* -f '$(top)/makefiles/$*.mk' install \
+build/packages/%: RECURSIVE build/workdir/% rules/%/Makefile
+	$(MAKE) -C build/workdir/$* -f '$(top)/rules/$*/Makefile' install \
 		DESTDIR='$(top)/$@' \
 		CLASSPATH='$(call deps2classpath,$^)'
 	mkdir -p build/packages/all && lndir -silent '$(top)/$@' build/packages/all
 
 
 $(addprefix build/packages/,$(package_generic)): \
-build/packages/%: RECURSIVE build/workdir/% makefiles/mvn-simple.mk
-	$(MAKE) -C build/workdir/$* -f '$(top)/makefiles/mvn-simple.mk' install \
+build/packages/%: RECURSIVE build/workdir/% rules/generic/Makefile
+	$(MAKE) -C build/workdir/$* -f '$(top)/rules/generic/Makefile' install \
 		DESTDIR='$(top)/$@' \
 		CLASSPATH='$(call deps2classpath,$^)'
 	mkdir -p build/packages/all && lndir -silent '$(top)/$@' build/packages/all
diff --git a/makefiles/guava.mk b/makefiles/guava.mk
deleted file mode 100644
index 2f176e6..0000000
--- a/makefiles/guava.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-srcdir = src
-include $(dir $(lastword $(MAKEFILE_LIST)))/mvn-simple.mk
diff --git a/makefiles/atinject-javax.inject-tck.mk b/rules/atinject-javax.inject-tck/Makefile
index b8ba8a8..b8ba8a8 100644
--- a/makefiles/atinject-javax.inject-tck.mk
+++ b/rules/atinject-javax.inject-tck/Makefile
diff --git a/delete/atinject-javax.inject-tck.txt b/rules/atinject-javax.inject-tck/delete.list
index a65b417..a65b417 100644
--- a/delete/atinject-javax.inject-tck.txt
+++ b/rules/atinject-javax.inject-tck/delete.list
diff --git a/makefiles/atinject-javax.inject.mk b/rules/atinject-javax.inject/Makefile
index 2ee9767..2ee9767 100644
--- a/makefiles/atinject-javax.inject.mk
+++ b/rules/atinject-javax.inject/Makefile
diff --git a/delete/atinject-javax.inject.txt b/rules/atinject-javax.inject/delete.list
index a65b417..a65b417 100644
--- a/delete/atinject-javax.inject.txt
+++ b/rules/atinject-javax.inject/delete.list
diff --git a/patches/atinject-javax.inject/fix-pom-xmlns.patch b/rules/atinject-javax.inject/fix-pom-xmlns.patch
index ec07205..ec07205 100644
--- a/patches/atinject-javax.inject/fix-pom-xmlns.patch
+++ b/rules/atinject-javax.inject/fix-pom-xmlns.patch
diff --git a/makefiles/mvn-simple.mk b/rules/generic/Makefile
index 4f4b73a..4f4b73a 100644
--- a/makefiles/mvn-simple.mk
+++ b/rules/generic/Makefile
diff --git a/rules/guava/Makefile b/rules/guava/Makefile
new file mode 100644
index 0000000..cb70ed9
--- /dev/null
+++ b/rules/guava/Makefile
@@ -0,0 +1,2 @@
+srcdir = src
+include $(dir $(lastword $(MAKEFILE_LIST)))/../generic/Makefile
diff --git a/makefiles/jsr305.mk b/rules/jsr305/Makefile
index ca5b6d2..ca5b6d2 100644
--- a/makefiles/jsr305.mk
+++ b/rules/jsr305/Makefile
diff --git a/patches/maven-plugin-api-bootstrap/no-generated-code.patch b/rules/maven-plugin-api-bootstrap/no-generated-code.patch
index 8d97c08..8d97c08 100644
--- a/patches/maven-plugin-api-bootstrap/no-generated-code.patch
+++ b/rules/maven-plugin-api-bootstrap/no-generated-code.patch
diff --git a/patches/maven-plugin-tools-api-bootstrap/no-maven-core.patch b/rules/maven-plugin-tools-api-bootstrap/no-maven-core.patch
index 71c0785..71c0785 100644
--- a/patches/maven-plugin-tools-api-bootstrap/no-maven-core.patch
+++ b/rules/maven-plugin-tools-api-bootstrap/no-maven-core.patch
diff --git a/patches/plexus-cipher/no-javaee.patch b/rules/plexus-cipher/no-javaee.patch
index b0cb5fa..b0cb5fa 100644
--- a/patches/plexus-cipher/no-javaee.patch
+++ b/rules/plexus-cipher/no-javaee.patch
diff --git a/patches/plexus-container-default/valid-java.patch b/rules/plexus-container-default/valid-java.patch
index 4a36d50..4a36d50 100644
--- a/patches/plexus-container-default/valid-java.patch
+++ b/rules/plexus-container-default/valid-java.patch
diff --git a/patches/xbean-reflect/no-log4j.patch b/rules/xbean-reflect/no-log4j.patch
index 7b9285c..7b9285c 100644
--- a/patches/xbean-reflect/no-log4j.patch
+++ b/rules/xbean-reflect/no-log4j.patch