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

1 files changed, 9 insertions, 9 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