Fix make files to get automatic extension suffix

gjbex · gjbex · commit ccb5cf07e25b · 2024-01-12T11:28:10.000+01:00
diff --git a/source-code/cython/Classes/Makefile b/source-code/cython/Classes/Makefile
@@ -1,6 +1,6 @@
-VERSION = cpython-311-x86_64-linux-gnu
-POINTS_LIB = points.$(VERSION).so
-POINTS_PURE_LIB = points_pure.$(VERSION).so
+VERSION = $(shell python3-config --extension-suffix)
+POINTS_LIB = points$(VERSION)
+POINTS_PURE_LIB = points_pure$(VERSION)
 
 all: $(POINTS_LIB)
 
diff --git a/source-code/cython/Exceptions/Makefile b/source-code/cython/Exceptions/Makefile
@@ -1,6 +1,6 @@
-VERSION = cpython-311-x86_64-linux-gnu
-AVERAGE_LIB = average.$(VERSION).so
-AVERAGE_PURE_LIB = average_pure.$(VERSION).so
+VERSION = $(shell python3-config --extension-suffix)
+AVERAGE_LIB = average$(VERSION)
+AVERAGE_PURE_LIB = average_pure$(VERSION)
 
 all: $(AVERAGE_LIB) $(AVERAGE_PURE_LIB)
 
diff --git a/source-code/cython/HelloWorld/Makefile b/source-code/cython/HelloWorld/Makefile
@@ -1,4 +1,4 @@
-VERSION = cpython-311-x86_64-linux-gnu
+VERSION = $(sheel python3-config --extension-suffix)
 HELLO_WORLD_LIB = hello_world.$(VERSION).so
 
 all: $(HELLO_WORLD_LIB)
diff --git a/source-code/cython/Numpy/Makefile b/source-code/cython/Numpy/Makefile
@@ -1,4 +1,4 @@
-VERSION = cpython-311-x86_64-linux-gnu
+VERSION = $(shell python3-config --extension-suffix)
 ARRAY_SUM_LIB = array_sum.$(VERSION).so
 ARRAY_INIT_LIB = array_init.$(VERSION).so
 ARRAY_SUM_PURE_LIB = array_sum_pure.$(VERSION).so
diff --git a/source-code/cython/Pi/Makefile b/source-code/cython/Pi/Makefile
@@ -9,4 +9,4 @@ $(LIB_FILES): $(PYX_FILES)
 
 clean:
 	python setup.py clean
-	rm -f $(C_FILES)  $(LIB_FILES)
+	$(RM) $(C_FILES)  $(LIB_FILES)
diff --git a/source-code/cython/Pointers/Makefile b/source-code/cython/Pointers/Makefile
@@ -1,4 +1,4 @@
-VERSION =  cpython-311-x86_64-linux-gnu
+VERSION =  $(shell python3-config --extension-suffix)
 CYTHON_LIB = pointers_cython.$(VERSION).so
 PURE_LIB = pointers_pure.$(VERSION).so
 
diff --git a/source-code/cython/Primes/Makefile b/source-code/cython/Primes/Makefile
@@ -1,4 +1,4 @@
-VERSION = cpython-311-x86_64-linux-gnu
+VERSION = $(shell python3-config --extension-suffix)
 PRIMES_LIBS = primes_cython.$(VERSION).so primes_cython3.$(VERSION).so \
 			  primes_pure_python.$(VERSION).so primes_pure_malloc.$(VERSION).so \
 			  primes_malloc.$(VERSION).so
diff --git a/source-code/cython/Profiling/Makefile b/source-code/cython/Profiling/Makefile
@@ -1,4 +1,4 @@
-VERSION = cpython-35m-x86_64-linux-gnu
+VERSION = $(shell python3-config --extension-suffix)
 
 QUAD_LIBS = quad.$(VERSION).so quad_prof.$(VERSION).so \
             quad_prof_indiv.$(VERSION).so
@@ -10,4 +10,4 @@ all: $(QUAD_LIBS)
 
 clean:
 	python setup.py clean
-	rm -f *.c $(QUAD_LIBS)
+	$(RM) *.c $(QUAD_LIBS)
diff --git a/source-code/cython/PythonCompoundTypes/Makefile b/source-code/cython/PythonCompoundTypes/Makefile
@@ -1,4 +1,4 @@
-VERSION = cpython-34m
+VERSION = $(shell python3-config --extension-suffix)
 COMPOUNDS_LIB = compounds.$(VERSION).so
 
 all: $(COMPOUNDS_LIB)
@@ -8,4 +8,4 @@ $(COMPOUNDS_LIB): compounds.pyx
 
 clean:
 	python setup.py clean
-	rm -f compounds.c $(COMPOUNDS_LIB)
+	$(RM) compounds.c $(COMPOUNDS_LIB)
diff --git a/source-code/cython/Structures/Makefile b/source-code/cython/Structures/Makefile
@@ -1,4 +1,4 @@
-VERSION = cpython-311-x86_64-linux-gnu
+VERSION = $(shell python3-config --extension-suffix)
 CYTHON_LIB = point_cython.$(VERSION).so
 PURE_LIB = point_pure.$(VERSION).so
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION = cpython-311-x86_64-linux-gnu`
	`1`	`+VERSION = $(sheel python3-config --extension-suffix)`
`2`	`2`	`HELLO_WORLD_LIB = hello_world.$(VERSION).so`
`3`	`3`
`4`	`4`	`all: $(HELLO_WORLD_LIB)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION = cpython-311-x86_64-linux-gnu`
	`1`	`+VERSION = $(shell python3-config --extension-suffix)`
`2`	`2`	`ARRAY_SUM_LIB = array_sum.$(VERSION).so`
`3`	`3`	`ARRAY_INIT_LIB = array_init.$(VERSION).so`
`4`	`4`	`ARRAY_SUM_PURE_LIB = array_sum_pure.$(VERSION).so`