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 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' >> $@