From 2b9ecc1ed19ff454694daf592114f6ffa5d24a94 Mon Sep 17 00:00:00 2001
From: Thomas Jahns <jahns@dkrz.de>
Date: Wed, 4 Sep 2019 11:25:28 +0200
Subject: [PATCH] Replace redundant library specifications.

* This also allows for overrides at make invocation.
---
 app/Makefile.am        | 2 +-
 interfaces/Makefile.am | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Makefile.am b/app/Makefile.am
index 3b4b919d1..711097c79 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -16,7 +16,7 @@ endif !ENABLE_CDI_APP
 #
 #
 cdi_SOURCES         = cdi.c printinfo.c printinfo.h
-cdi_LDADD           = $(top_builddir)/src/libcdi.la @LIBS@
+cdi_LDADD           = $(top_builddir)/src/libcdi.la $(LIBS)
 if ENABLE_ALL_STATIC
 cdi_LDFLAGS         = -all-static
 endif
diff --git a/interfaces/Makefile.am b/interfaces/Makefile.am
index f219e7c51..dad31a137 100644
--- a/interfaces/Makefile.am
+++ b/interfaces/Makefile.am
@@ -31,11 +31,11 @@ noinst_PROGRAMS += CdiInfo
 noinst_LTLIBRARIES += libcdipp.la
 endif
 #
-locallibs = $(abs_top_builddir)/src/.libs/libcdi.so @LTLIBOBJS@ @NETCDF_LIBS@ @SZLIB_LIBS@
+locallibs = $(abs_top_builddir)/src/.libs/libcdi.so $(LTLIBOBJS) $(NETCDF_LIBS) $(SZLIB_LIBS)
 
 libcdipp_la_SOURCES = cdi.cpp cdi.hpp
 libcdipp_la_LIBADD  = $(top_builddir)/src/libcdi.la
-AM_LDFLAGS = @NETCDF_LIBS@ @SZLIB_LIBS@ $(LDFLAGS)
+AM_LDFLAGS = $(NETCDF_LIBS) $(SZLIB_LIBS) $(LDFLAGS)
 
 CdiInfo_SOURCES     = CdiInfo.cpp
 CdiInfo_LDADD       = libcdipp.la
-- 
GitLab