Skip to content
Snippets Groups Projects
Commit e0a7cac4 authored by Sergey Kosukhin's avatar Sergey Kosukhin
Browse files

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.
parent d5c56df8
No related branches found
No related tags found
1 merge request!14Draft: K202125/cdi 1.8.x pio merge followup
......@@ -62,10 +62,10 @@ cdi_write_hybrid_SOURCES = cdi_write_hybrid.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)
......
......@@ -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
......
......@@ -173,7 +173,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 \
......@@ -188,7 +188,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
......@@ -199,7 +199,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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment