From 347a59d453fb6dcf3a66ea78ec0cae6431a017c2 Mon Sep 17 00:00:00 2001
From: Sergey Kosukhin <sergey.kosukhin@mpimet.mpg.de>
Date: Tue, 23 Nov 2021 19:40:05 +0100
Subject: [PATCH] Do not rely on libtool overlinking.

This enables building with versions of libtool that are patched to avoid
overlinking (e.g. on Debian systems). It is also a bad idea in general to rely
on negative side-effects, which overlinking is, and we try to avoid that.
---
 examples/Makefile.am     | 4 ++--
 examples/pio/Makefile.am | 8 ++++----
 tests/Makefile.am        | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/Makefile.am b/examples/Makefile.am
index f814214c2..b756d0b98 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -71,10 +71,10 @@ cdi_write_relativ_SOURCES = cdi_write_relativ.c
 cdi_write_const_SOURCES = cdi_write_const.c
 
 cdi_read_f2003_SOURCES = cdi_read_f2003.f90
-cdi_read_f2003_LDADD = $(top_builddir)/src/libcdi_f2003.la
+cdi_read_f2003_LDADD = $(top_builddir)/src/libcdi_f2003.la $(LDADD)
 
 cdi_write_f2003_SOURCES = cdi_write_f2003.f90
-cdi_write_f2003_LDADD = $(top_builddir)/src/libcdi_f2003.la
+cdi_write_f2003_LDADD = $(top_builddir)/src/libcdi_f2003.la $(LDADD)
 
 if FC_MOD_UPPERCASE
 mo_cdi_mod = MO_CDI.$(FCMODEXT)
diff --git a/examples/pio/Makefile.am b/examples/pio/Makefile.am
index 0027af12a..cace9af83 100644
--- a/examples/pio/Makefile.am
+++ b/examples/pio/Makefile.am
@@ -46,18 +46,18 @@ LDADD = $(top_builddir)/src/libcdi.la
 
 collectData_SOURCES = collectData.c
 nodist_collectData_parallel_SOURCES = collectData.parallel.c
-collectData_parallel_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_C_LIB)
+collectData_parallel_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_C_LIB) $(LDADD)
 
 collectDataNStreams_SOURCES = collectDataNStreams.c
 nodist_collectDataNStreams_parallel_SOURCES = collectDataNStreams.parallel.c
-collectDataNStreams_parallel_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_C_LIB)
+collectDataNStreams_parallel_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_C_LIB) $(LDADD)
 
 compareResourcesArray_SOURCES = compareResourcesArray.c
-compareResourcesArray_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_C_LIB)
+compareResourcesArray_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_C_LIB) $(LDADD)
 
 collectData2003_SOURCES = collectData2003.F90
 nodist_collectData2003_parallel_SOURCES = collectData2003.parallel.F90
-collectData2003_parallel_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_FC_LIB) $(MPI_FC_LIB)
+collectData2003_parallel_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_FC_LIB) $(MPI_FC_LIB) $(LDADD)
 
 clean-local:
 	-rm -f *.parallel.c *.parallel.F90
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 01816633c..9bebc7f8a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -174,7 +174,7 @@ nodist_pio_write_parallel_SOURCES = \
   pio_write_setup_grid.parallel.c \
   simple_model.parallel.c \
   simple_model_helper.parallel.c
-pio_write_parallel_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_C_LIB)
+pio_write_parallel_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_C_LIB) $(LDADD)
 
 pio_write_deco2d_SOURCES = \
   deco2d_model.c \
@@ -189,7 +189,7 @@ nodist_pio_write_deco2d_parallel_SOURCES = \
   pio_write.parallel.c \
   pio_write_setup_grid.parallel.c \
   simple_model_helper.parallel.c
-pio_write_deco2d_parallel_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_C_LIB)
+pio_write_deco2d_parallel_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_C_LIB) $(LDADD)
 
 test_byteswap_SOURCES = test_byteswap.c
 
@@ -200,7 +200,7 @@ test_month_adjust_SOURCES = test_month_adjust.c
 test_resource_copy_SOURCES = test_resource_copy.c
 test_resource_copy_LDADD = $(top_builddir)/src/libcdiresunpack.la
 nodist_test_resource_copy_parallel_SOURCES = test_resource_copy.parallel.c
-test_resource_copy_parallel_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_C_LIB)
+test_resource_copy_parallel_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_C_LIB) $(LDADD)
 
 test_table_SOURCES = test_table.c
 
-- 
GitLab