Skip to content
Snippets Groups Projects
Commit 2b9ecc1e authored by Thomas Jahns's avatar Thomas Jahns :cartwheel: Committed by Sergey Kosukhin
Browse files

Replace redundant library specifications.

* This also allows for overrides at make invocation.
parent 76fa76d7
No related branches found
No related tags found
2 merge requests!34Version 2.2.0,!13Consolidation with CDI-PIO (develop)
......@@ -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
......
......@@ -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
......
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