rnatm

commit 49b2c36f95c28dac80cb9b4df585dc7c69327289
parent 8e4d2221d75391ce06acac60d7aa2e37408ab952
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue, 26 Sep 2023 10:28:03 +0200

Small editition of the Makefile, README and config files

For ease of reading, the dependencies are listed in alphabetical order,
with the exception of rnsf and rnsl, which have been mistakenly
interchanged.

Diffstat:
M
Makefile
 | 
8
++++----
M
README.md
 | 
2
+-
M
config.mk
 | 
12
++++++------

3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
@@ -63,10 +63,10 @@ $(LIBNAME_STATIC): $(OBJ)
 	$(RANLIB) $@
 
 .config: config.mk
-	@if ! $(PKG_CONFIG) --atleast-version $(RNSL_VERSION) rnsl; then \
-	  echo "rnsl $(RNSL_VERSION) not found" >&2; exit 1; fi
 	@if ! $(PKG_CONFIG) --atleast-version $(RNSF_VERSION) rnsf; then \
 	  echo "rnsf $(RNSF_VERSION) not found" >&2; exit 1; fi
+	@if ! $(PKG_CONFIG) --atleast-version $(RNSL_VERSION) rnsl; then \
+	  echo "rnsl $(RNSL_VERSION) not found" >&2; exit 1; fi
 	@if ! $(PKG_CONFIG) --atleast-version $(RSYS_VERSION) rsys; then \
 	  echo "rsys $(RSYS_VERSION) not found" >&2; exit 1; fi
 	@if ! $(PKG_CONFIG) --atleast-version $(SARS_VERSION) sars; then \
@@ -98,8 +98,8 @@ $(LIBNAME_STATIC): $(OBJ)
 pkg:
 	sed -e 's#@PREFIX@#$(PREFIX)#g'\
 	    -e 's#@VERSION@#$(VERSION)#g'\
-	    -e 's#@RNSL_VERSION@#$(RNSL_VERSION)#g'\
 	    -e 's#@RNSF_VERSION@#$(RNSF_VERSION)#g'\
+	    -e 's#@RNSL_VERSION@#$(RNSL_VERSION)#g'\
 	    -e 's#@RSYS_VERSION@#$(RSYS_VERSION)#g'\
 	    -e 's#@SARS_VERSION@#$(SARS_VERSION)#g'\
 	    -e 's#@SBUF_VERSION@#$(SBUF_VERSION)#g'\
@@ -115,8 +115,8 @@ rnatm-local.pc: rnatm.pc.in
 	    -e 's#^includedir=.*#includedir=./src/#'\
 	    -e 's#^libdir=.*#libdir=./#'\
 	    -e 's#@VERSION@#$(VERSION)#g'\
-	    -e 's#@RNSL_VERSION@#$(RNSL_VERSION)#g'\
 	    -e 's#@RNSF_VERSION@#$(RNSF_VERSION)#g'\
+	    -e 's#@RNSL_VERSION@#$(RNSL_VERSION)#g'\
 	    -e 's#@RSYS_VERSION@#$(RSYS_VERSION)#g'\
 	    -e 's#@SARS_VERSION@#$(SARS_VERSION)#g'\
 	    -e 's#@SBUF_VERSION@#$(SBUF_VERSION)#g'\
diff --git a/README.md b/README.md
@@ -7,8 +7,8 @@ This C library loads and manages data describing an atmosphere.
 - C compiler
 - POSIX make
 - pkg-config
-- [Rad-Net String List](https://gitlab.com/meso-star/rnsl)
 - [Rad-Net Scattering Functions](https://gitlab.com/meso-star/rnsf)
+- [Rad-Net String List](https://gitlab.com/meso-star/rnsl)
 - [RSys](https://gitlab.com/vaplv/rsys)
 - [Star AeRoSol](https://gitlab.com/meso-star/star-aerosol)
 - [Star Buffer](https://gitlab.com/meso-star/star-buffer)
diff --git a/config.mk b/config.mk
@@ -22,14 +22,14 @@ PCFLAGS_SHARED =
 PCFLAGS_STATIC = --static
 PCFLAGS = $(PCFLAGS_$(LIB_TYPE))
 
-RNSL_VERSION = 0.0
-RNSL_CFLAGS = $$($(PKG_CONFIG) $(PCFLAGS) --cflags rnsl)
-RNSL_LIBS = $$($(PKG_CONFIG) $(PCFLAGS) --libs rnsl)
-
 RNSF_VERSION = 0.0
 RNSF_CFLAGS = $$($(PKG_CONFIG) $(PCFLAGS) --cflags rnsf)
 RNSF_LIBS = $$($(PKG_CONFIG) $(PCFLAGS) --libs rnsf)
 
+RNSL_VERSION = 0.0
+RNSL_CFLAGS = $$($(PKG_CONFIG) $(PCFLAGS) --cflags rnsl)
+RNSL_LIBS = $$($(PKG_CONFIG) $(PCFLAGS) --libs rnsl)
+
 RSYS_VERSION = 0.13
 RSYS_CFLAGS = $$($(PKG_CONFIG) $(PCFLAGS) --cflags rsys)
 RSYS_LIBS = $$($(PKG_CONFIG) $(PCFLAGS) --libs rsys)
@@ -63,8 +63,8 @@ SVX_CFLAGS = $$($(PKG_CONFIG) $(PCFLAGS) --cflags svx)
 SVX_LIBS = $$($(PKG_CONFIG) $(PCFLAGS) --libs svx)
 
 DPDC_CFLAGS =\
- $(RNSL_CFLAGS)\
  $(RNSF_CFLAGS)\
+ $(RNSL_CFLAGS)\
  $(RSYS_CFLAGS)\
  $(SARS_CFLAGS)\
  $(SBUF_CFLAGS)\
@@ -76,8 +76,8 @@ DPDC_CFLAGS =\
  -fopenmp
 
 DPDC_LIBS =\
- $(RNSL_LIBS)\
  $(RNSF_LIBS)\
+ $(RNSL_LIBS)\
  $(RSYS_LIBS)\
  $(SARS_LIBS)\
  $(SBUF_LIBS)\