From c2d241eed42c85e58df18889165d3802c84a8ed7 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@kth.se>
Date: Sun, 2 Jul 2023 20:02:04 +0200
Subject: Improve makefile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@kth.se>
---
 Makefile  | 17 +++++------------
 config.mk | 15 +++++++++++----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index ab06f19..b451bca 100644
--- a/Makefile
+++ b/Makefile
@@ -7,13 +7,6 @@ OS = linux
 include mk/$(OS).mk
 
 
-python         = python$(PYTHON_MAJOR)
-python_version = $(PYTHON_MAJOR).$(PYTHON_MINOR)
-python_ver     = $(PYTHON_MAJOR)$(PYTHON_MINOR)
-python_dir     = $(PREFIX)/lib/python$(python_version)/site-packages
-python_cache   = $(python_dir)/__pycache__
-
-
 OBJ =\
 	libgamma_native_error.o\
 	libgamma_native_facade.o\
@@ -38,17 +31,17 @@ libgamma_native_error.pyx: libgamma_native_error.$(PLATFORM).pyx
 	$(CC) -o $@ $< -shared $(LDFLAGS)
 
 .c.o:
-	$(CC) -fPIC -c -o $@ $< $$(pkg-config --cflags $(python)) $(CFLAGS) $(CPPFLAGS)
+	$(CC) -fPIC -c -o $@ $< $$(pkg-config --cflags $(PYTHON)) $(CFLAGS) $(CPPFLAGS)
 
 .pyx.c:
-	if ! cython -$(PYTHON_MAJOR) -v $< -o $@ ; then rm $@; false; fi
+	if ! $(CYTHON) -$(PYTHON_MAJOR) -v $< -o $@ ; then rm $@; false; fi
 
 install: $(LIBFILES)
-	mkdir -p -- "$(DESTDIR)$(python_dir)"
-	cp -- $(FILES) "$(DESTDIR)$(python_dir)/"
+	mkdir -p -- "$(DESTDIR)$(PYTHON_DIR)"
+	cp -- $(FILES) "$(DESTDIR)$(PYTHON_DIR)/"
 
 uninstall:
-	-cd -- "$(DESTDIR)$(python_dir)" && rm -f -- $(FILES)
+	-cd -- "$(DESTDIR)$(PYTHON_DIR)" && rm -f -- $(FILES)
 
 run-test: $(LIBFILES)
 	./test.py
diff --git a/config.mk b/config.mk
index 51eba37..c404ee7 100644
--- a/config.mk
+++ b/config.mk
@@ -1,10 +1,17 @@
 PREFIX = /usr
 
-PYTHON_MAJOR = $$(python --version 2>&1 | cut -d . -f 1 | cut -d ' ' -f 2)
+PYTHON_MAJOR = $$(python --version 2>&1 | cut -d ' ' -f 2 | cut -d . -f 1)
 PYTHON_MINOR = $$(python$(PYTHON_MAJOR) --version 2>&1 | cut -d . -f 2)
 
-CC = c99
+PYTHON_VERSION = $(PYTHON_MAJOR).$(PYTHON_MINOR)
+PYTHON_VER     = $(PYTHON_MAJOR)$(PYTHON_MINOR)
+PYTHON_DIR     = $(PREFIX)/lib/python$(python_version)/site-packages
+PYTHON_CACHE   = $(python_dir)/__pycache__
+
+CC     = c99
+CYTHON = cython$(PYTHON_MAJOR)
+PYTHON = python$(PYTHON_MAJOR)
 
 CPPFLAGS =
-CFLAGS =
-LDFLAGS = -lgamma
+CFLAGS   =
+LDFLAGS  = -lgamma
-- 
cgit v1.2.3-70-g09d2