From 3115e9e9f8d431df1980be666088f2a0a8b7385a Mon Sep 17 00:00:00 2001
From: Michele Guerini Rocco <m.guerinirocco2@campus.unimib.it>
Date: Mon, 22 Apr 2024 16:11:44 +0200
Subject: [PATCH] move vendored libraries to their own directory

---
 LICENSE.md                    | 22 +++++++++++++---------
 Makefile                      |  8 ++++++--
 src/{ => vendor}/conical.f90  |  0
 src/{ => vendor}/dierckx.f90  |  0
 src/{ => vendor}/eierf.f90    |  0
 src/{ => vendor}/minpack.f90  |  0
 src/{ => vendor}/numint.f90   |  0
 src/{ => vendor}/quadpack.f90 |  0
 8 files changed, 19 insertions(+), 11 deletions(-)
 rename src/{ => vendor}/conical.f90 (100%)
 rename src/{ => vendor}/dierckx.f90 (100%)
 rename src/{ => vendor}/eierf.f90 (100%)
 rename src/{ => vendor}/minpack.f90 (100%)
 rename src/{ => vendor}/numint.f90 (100%)
 rename src/{ => vendor}/quadpack.f90 (100%)

diff --git a/LICENSE.md b/LICENSE.md
index 8fa2e9d..20c7a3d 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -45,14 +45,18 @@ referenced by citing:
 [N. B. Marushchenko, C. D. Beidler, and H. Maassberg, *Fusion Sci.
 Technol.* **55** (2009) 180](https://doi.org/10.13182/FST55-180).
 
-GRAY includes adaptations of software developed by the University of
+GRAY contains adaptations of software developed by the University of
 Chicago, as Operator of Argonne National Laboratory, and other public
-domain libraries
-([`dierckx`](https://netlib.org/dierckx/),
-[`minpack`](https://netlib.org/minpack/),
-[`quadpack`](https://netlib.org/quadpack/),
-[`slatec`](https://netlib.org/slatec/))
-obtained from the [Netlib](https://netlib.org/) repository.
+domain libraries, including but not limited to, the following packages
 
-The full license notice for the `minpack` library can be found in the
-[documentation](./minpack-LICENSE.txt).
+  - [`dierckx`](https://netlib.org/dierckx/),
+
+  - [`minpack`](https://netlib.org/minpack/),
+
+  - [`quadpack`](https://netlib.org/quadpack/),
+
+  - [`slatec`](https://netlib.org/slatec/)
+
+that were obtained from the [Netlib](https://netlib.org/) repository.
+For more information refer to the relevant source code in the
+[src/vendor]{./src/vendor} directory.
diff --git a/Makefile b/Makefile
index 7a2e0f2..97cefc6 100644
--- a/Makefile
+++ b/Makefile
@@ -33,10 +33,10 @@ DIRS = $(BINDIR) $(OBJDIR) $(INCDIR) $(LIBDIR) $(SHAREDIR)
 ##
 
 # All Fortran source files
-SOURCES = $(wildcard $(SRCDIR)/*.f90)
+SOURCES = $(shell find '$(SRCDIR)' -name '*.f90')
 
 # All Fortran object
-OBJECTS = $(patsubst $(SRCDIR)/%.f90,$(OBJDIR)/%.o,$(SOURCES))
+OBJECTS = $(addprefix $(OBJDIR)/,$(notdir $(SOURCES:f90=o)))
 
 # Generated makefiles describing object dependencies
 DEPS = $(OBJECTS:o=d)
@@ -226,6 +226,10 @@ $(OBJDIR)/%.d: $(SRCDIR)/%.f90 | $(OBJDIR)
 $(OBJDIR)/%.o: $(SRCDIR)/%.f90 | $(OBJDIR) $(INCDIR)
 	$(FC) -cpp $(CPPFLAGS) $(FFLAGS) -c '$<' -o '$@'
 
+# Compile vendored libraries
+$(OBJDIR)/%.o: $(SRCDIR)/vendor/%.f90 | $(OBJDIR) $(INCDIR)
+	$(FC) -cpp $(CPPFLAGS) $(FFLAGS) -c '$<' -o '$@'
+
 # Generate Fortran code from awk script
 $(INCDIR)/%.inc: $(SRCDIR)/%.awk | $(INCDIR)
 	awk -f '$<' > '$@'
diff --git a/src/conical.f90 b/src/vendor/conical.f90
similarity index 100%
rename from src/conical.f90
rename to src/vendor/conical.f90
diff --git a/src/dierckx.f90 b/src/vendor/dierckx.f90
similarity index 100%
rename from src/dierckx.f90
rename to src/vendor/dierckx.f90
diff --git a/src/eierf.f90 b/src/vendor/eierf.f90
similarity index 100%
rename from src/eierf.f90
rename to src/vendor/eierf.f90
diff --git a/src/minpack.f90 b/src/vendor/minpack.f90
similarity index 100%
rename from src/minpack.f90
rename to src/vendor/minpack.f90
diff --git a/src/numint.f90 b/src/vendor/numint.f90
similarity index 100%
rename from src/numint.f90
rename to src/vendor/numint.f90
diff --git a/src/quadpack.f90 b/src/vendor/quadpack.f90
similarity index 100%
rename from src/quadpack.f90
rename to src/vendor/quadpack.f90