From 13d5191d77af62542a34a871e3b0ba4b27b9ad31 Mon Sep 17 00:00:00 2001
From: Thomas Hobson <git@hexf.me>
Date: Sat, 20 Feb 2021 18:34:44 +1300
Subject: [PATCH] pkg(python): refactor

---
 packages/python/Makefile | 22 +---------------------
 packages/python/base.mk  |  8 +++-----
 packages/secondary.mk    | 22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 packages/secondary.mk

diff --git a/packages/python/Makefile b/packages/python/Makefile
index 4e1ab09..23daac2 100644
--- a/packages/python/Makefile
+++ b/packages/python/Makefile
@@ -1,24 +1,4 @@
 LANGUAGE=python
 VERSIONS=2.7.1 3.9.1
 
-.PHONY: build sign cleanup clean
-build: $(patsubst %,%/${LANGUAGE}-%.pkg.tar.gz,${VERSIONS})
-sign: $(patsubst %,%/${LANGUAGE}-%.pkg.tar.gz.asc,${VERSIONS})
-clean:
-	rm -rf ${VERSIONS}
-cleanup: $(patsubst %,%/cleanup,${VERSIONS})
-	
-
-%/cleanup: %/Makefile
-	$(MAKE) -C $(shell dirname $<) cleanup
-	rm $(shell dirname $<)/Makefile
-
-%/${LANGUAGE}-%.pkg.tar.gz.asc: %/Makefile
-	$(MAKE) -C $(shell dirname $<) sign
-%/${LANGUAGE}-%.pkg.tar.gz: %/Makefile
-	$(MAKE) -C $(shell dirname $<)
-
-%/Makefile: 
-	@mkdir -p $(shell dirname $@)
-	@echo 'VERSION=$(patsubst %/Makefile,%,$@)' > $@
-	@echo 'include ../base.mk' >> $@
+include ../secondary.mk
\ No newline at end of file
diff --git a/packages/python/base.mk b/packages/python/base.mk
index bcb11d1..8c3b746 100644
--- a/packages/python/base.mk
+++ b/packages/python/base.mk
@@ -1,7 +1,5 @@
-NAME=python
 AUTHOR=Thomas Hobson <thomas@hexf.me>
 DEPS=
-#VERSION=
 COMPILED=false
 
 include ../../common.mk
@@ -9,13 +7,13 @@ include ../../common.mk
 run:
 	echo 'python$(shell grep -oP "\d+.\d+"<<<${VERSION}) $$*' > run
 
-python-${VERSION}/environment:
+${NAME}-${VERSION}/environment:
 	echo 'export PATH=$$PWD/${NAME}-${VERSION}/bin:$$PATH' > $@
 
-python-${VERSION}/: Python-${VERSION}/
+${NAME}-${VERSION}/: Python-${VERSION}/
 	cd $< && ./configure --prefix /
 	$(MAKE) -j$(or ${MAKE_JOBS},64) -C $<
 	DESTDIR=../$@ $(MAKE) -j$(or ${MAKE_JOBS},64) -C $< altinstall || true
 
-Python-${VERSION}.tgz: 
+${NAME}-${VERSION}.tgz: 
 	curl "https://www.python.org/ftp/python/${VERSION}/$@" -o $@
\ No newline at end of file
diff --git a/packages/secondary.mk b/packages/secondary.mk
new file mode 100644
index 0000000..a748fa6
--- /dev/null
+++ b/packages/secondary.mk
@@ -0,0 +1,22 @@
+.PHONY: build sign cleanup clean
+build: $(patsubst %,%/${LANGUAGE}-%.pkg.tar.gz,${VERSIONS})
+sign: $(patsubst %,%/${LANGUAGE}-%.pkg.tar.gz.asc,${VERSIONS})
+clean:
+	rm -rf ${VERSIONS}
+cleanup: $(patsubst %,%/cleanup,${VERSIONS})
+	
+
+%/cleanup: %/Makefile
+	$(MAKE) -C $(shell dirname $<) cleanup
+	rm $(shell dirname $<)/Makefile
+
+%/${LANGUAGE}-%.pkg.tar.gz.asc: %/Makefile
+	$(MAKE) -C $(shell dirname $<) sign
+%/${LANGUAGE}-%.pkg.tar.gz: %/Makefile
+	$(MAKE) -C $(shell dirname $<)
+
+%/Makefile: 
+	@mkdir -p $(shell dirname $@)
+	@echo 'VERSION=$(patsubst %/Makefile,%,$@)' > $@
+	@echo 'NAME=${LANGUAGE}' > $@
+	@echo 'include ../base.mk' >> $@