BLD: Generic Makefiles in subdirectories.

Makefile

@@ -6,17 +6,17 @@ endif
 
 .PHONY: clean install uninstall copy_h copy_a shared_linux shared_windows shared_darwin
 
-all: $(LIBNAME)
+all: clean $(LIBNAME)
 
 $(LIBNAME): build copy_a shared copy_h copy_shared
 
 generator:
- make -C ./srcgen/version
+ make -C srcgen generator
 
-build: clean generator
+build: generator
  fpm build --profile=release
 
-build_debug: clean generator
+build_debug: generator
  fpm build --profile=debug
 
 test: build
@@ -68,7 +68,7 @@ copy_shared_windows:
 clean:
  fpm clean --all
  rm -f src/*.mod
- make -C srcgen/version clean
+ make -C srcgen clean
  make -C $(PYW_MOD_DIR) clean
 
 install: install_dirs install_$(PLATFORM)

pywrapper/build.bat

@@ -1,21 +1,23 @@
 rd /s /q build
 rd /s /q dist
-rd /s /q pyiapws.egg-info
-del .\pyiapws\*.pyd
-
-py -3.11 setup.py sdist
+rd /s /q *egg-info
 
 py -3.8 setup.py build_ext --inplace
 py -3.9 setup.py build_ext --inplace
 py -3.10 setup.py build_ext --inplace
 py -3.11 setup.py build_ext --inplace
+py -3.12 setup.py build_ext --inplace
+
+py -3.12 -m build --no-isolation --sdist
 
-py -3.8 setup.py bdist_wheel 
-py -3.9 setup.py bdist_wheel 
-py -3.10 setup.py bdist_wheel 
-py -3.11 setup.py bdist_wheel 
+py -3.8 -m build --no-isolation --wheel 
+py -3.9 -m build --no-isolation --wheel 
+py -3.10 -m build --no-isolation --wheel 
+py -3.11 -m build --no-isolation --wheel 
+py -3.12 -m build --no-isolation --wheel 
 
 py -3.8 -m unittest -v
 py -3.9 -m unittest -v
 py -3.10 -m unittest -v
 py -3.11 -m unittest -v
+py -3.12 -m unittest -v

pywrapper/build.sh

@@ -10,25 +10,26 @@ fi
 rm -r build
 rm -r dist
 rm -r *egg-info
-rm ./pyiapws/g704*.so
-rm ./pyiapws/r283*.so
-
-py311 setup.py sdist
 
 py38 setup.py build_ext --inplace
 py39 setup.py build_ext --inplace
 py310 setup.py build_ext --inplace
 py311 setup.py build_ext --inplace
+py312 setup.py build_ext --inplace
+
+py312 -m build --no-isolation --sdist
 
-py38 setup.py bdist_wheel
-py39 setup.py bdist_wheel
-py310 setup.py bdist_wheel
-py311 setup.py bdist_wheel
+py38 -m build --no-isolation --wheel
+py39 -m build --no-isolation --wheel
+py310 -m build --no-isolation --wheel
+py311 -m build --no-isolation --wheel
+py312 -m build --no-isolation --wheel
 
 py38 -m unittest -v
 py39 -m unittest -v
 py310 -m unittest -v
 py311 -m unittest -v
+py312 -m unittest -v
 
 if [[ "$OSTYPE" == "linux"* ]];then
  cd ./dist

pywrapper/pyiapws/Makefile

@@ -1,7 +1,8 @@
-
-
 clean:
- rm -f iapws*
- rm -f libiapws*
- rm -f *cpython*
+ rm -f *.h
+ rm -f *.a
+ rm -f *.so
+ rm -f *.dylib
+ rm -f *.dll
+ rm -f *.dll.a
  rm -f *.pyd

srcgen/Makefile

@@ -0,0 +1,5 @@
+generator: 
+ make -C version 
+
+clean:
+ make -C version clean

srcgen/version/Makefile

@@ -1,15 +1,14 @@
 CC=gcc
 FC=gfortran
 FFLAGS=-std=f2008 -Wall -Wextra -pedantic
+OBJECTS=core.o fortran.o cheader.o python.o main.o
 
-.PHONY: generate
+all: generator
 
-all: srcgen
-
-srcgen: generator
+generator: build
  ./generator
 
-generator: core.o fortran.o cheader.o python.o main.o
+build: $(OBJECTS)
  $(FC) $^ -o generator
 
 %.o: %.f90