Merge pull request #63 from danieljprice/fix-parallel-make

Fix parallel make

.github/workflows/build.yml

@@ -49,5 +49,5 @@ jobs:
       run: |
         Xvfb :99 -screen 0 1920x1080x24 &
         echo "Current DISPLAY: $DISPLAY"
-        yes "" | make check || { echo "Tests failed. Printing test-suite.log..."; cat test/C/test-suite.log; exit 1; }
+        yes "" | make check || { echo "Tests failed. Printing test-suite.log..."; cat test/C/test-suite.log; cat test/F90/test-suite.log; exit 1; }
  

LATEST.md

@@ -1,6 +1,5 @@
-Changes in v1.4.3
+Changes in v1.4.4
 -----------------
-- bug fix with parsing longer escape sequences that contain shorter ones, like \beta (containing \b) and \gamma (containing \ga)
-- added \odot symbol
-- revert marker 1 to point plotting, not resized with character height
+- bug fix with missing dynamic libraries in v1.4.3 and v1.4.2 (#61; thanks to Ole Streicher)
+- bug fix with test suite using make -j (#62; thanks to Ole Streicher)
 

NEWS

@@ -1,3 +1,8 @@
+Changes in v1.4.4
+-----------------
+- bug fix with missing dynamic libraries in v1.4.3 and v1.4.2 (#61; thanks to Ole Streicher)
+- bug fix with test suite using make -j (#62; thanks to Ole Streicher)
+
 Changes in v1.4.3
 -----------------
 - bug fix with parsing longer escape sequences that contain shorter ones, like \beta (containing \b) and \gamma (containing \ga)

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for giza 1.4.3.
+# Generated by GNU Autoconf 2.72 for giza 1.4.4.
 #
 # Report bugs to <daniel.price@monash.edu>.
 #
@@ -614,8 +614,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='giza'
 PACKAGE_TARNAME='giza'
-PACKAGE_VERSION='1.4.3'
-PACKAGE_STRING='giza 1.4.3'
+PACKAGE_VERSION='1.4.4'
+PACKAGE_STRING='giza 1.4.4'
 PACKAGE_BUGREPORT='daniel.price@monash.edu'
 PACKAGE_URL='http://danieljprice.github.io/giza'
 
@@ -1383,7 +1383,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-'configure' configures giza 1.4.3 to adapt to many kinds of systems.
+'configure' configures giza 1.4.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1454,7 +1454,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of giza 1.4.3:";;
+     short | recursive ) echo "Configuration of giza 1.4.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1584,7 +1584,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-giza configure 1.4.3
+giza configure 1.4.4
 generated by GNU Autoconf 2.72
 
 Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1896,7 +1896,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by giza $as_me 1.4.3, which was
+It was created by giza $as_me 1.4.4, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3370,7 +3370,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='giza'
- VERSION='1.4.3'
+ VERSION='1.4.4'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -4998,7 +4998,7 @@ GIZA_VERSION_MAJOR=1
 
 GIZA_VERSION_MINOR=4
 
-GIZA_VERSION_MICRO=3
+GIZA_VERSION_MICRO=4
 
 #
 # The following specify the interface version numbers for giza.
@@ -5014,7 +5014,7 @@ GIZA_VERSION_MICRO=3
 #
 LT_CURRENT=1
 
-LT_REVISION=3
+LT_REVISION=4
 
 LT_AGE=1
 
@@ -17367,7 +17367,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by giza $as_me 1.4.3, which was
+This file was extended by giza $as_me 1.4.4, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17436,7 +17436,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-giza config.status 1.4.3
+giza config.status 1.4.4
 configured by $0, generated by GNU Autoconf 2.72,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,7 +1,7 @@
 AC_PREREQ(2.61)
 m4_define(giza_version_major,1)
 m4_define(giza_version_minor,4)
-m4_define(giza_version_micro,3)
+m4_define(giza_version_micro,4)
 AC_INIT([giza],
         [giza_version_major.giza_version_minor.giza_version_micro],
         [daniel.price@monash.edu],[],

docs/news/index.html

@@ -21,6 +21,7 @@
 
   <div id="content">
     <h1>News</h1>
+    <p>2024.12.05: <a href="https://github.com/danieljprice/giza/releases">1.4.4</a> released.</p>
     <p>2024.12.03: <a href="https://github.com/danieljprice/giza/releases">1.4.3</a> released.</p>
     <p>2024.12.02: <a href="https://github.com/danieljprice/giza/releases">1.4.2</a> released.</p>
     <p>2023.11.30: <a href="https://github.com/danieljprice/giza/releases">1.4.1</a> released.</p>

test/F90/Makefile.am

@@ -11,12 +11,12 @@ check_PROGRAMS = $(ftests)
 AM_DEFAULT_SOURCE_EXT = .f90
 
 # Ensure that the tests are built as part of the 'check' target
-check: check_output_files $(ftests)
+check: $(ftests) check_output_files
 
 test_output_files = giza-test.png giza-test-2D.png
 
 # Custom target to check for the existence of expected output files from the Fortran tests
-check_output_files:
+check_output_files: $(ftests)
 	@echo "Checking for required png files..."
 	@for i in $(test_output_files); do \
 	    if [ ! -s $$i ]; then \

test/F90/Makefile.in

@@ -1021,10 +1021,10 @@ uninstall-am:
 
 
 # Ensure that the tests are built as part of the 'check' target
-check: check_output_files $(ftests)
+check: $(ftests) check_output_files
 
 # Custom target to check for the existence of expected output files from the Fortran tests
-check_output_files:
+check_output_files: $(ftests)
 	@echo "Checking for required png files..."
 	@for i in $(test_output_files); do \
 	    if [ ! -s $$i ]; then \