From 9ed1458cd8041d99fbd21ca78fafd92d3697f79d Mon Sep 17 00:00:00 2001 From: A Bartok-Partay Date: Thu, 6 Oct 2016 12:13:39 +0100 Subject: [PATCH] collect NETCDF linking stuff separately so it can be used by other make systems --- Makefile.rules | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.rules b/Makefile.rules index e02d9b90e6..c0fabf1b81 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -62,19 +62,21 @@ SYSLIBS += -L${FOX_LIBDIR} ${FOX_LIBS} INCLUDES += -I${QUIP_ROOT}/src/libAtoms -I${FOX_INCDIR} ifeq (${HAVE_NETCDF},1) - SYSLIBS += $(addprefix -L,${NETCDF_LIBDIR}) + NETCDF_SYSLIBS = $(addprefix -L,${NETCDF_LIBDIR}) INCLUDES += $(addprefix -I,${NETCDF_INCDIR}) ifeq (${NETCDF4}, 1) DEFINES += -DHAVE_NETCDF -DNETCDF4 - SYSLIBS += ${NETCDF4_LIBS} + NETCDF_SYSLIBS += ${NETCDF4_LIBS} ifeq (${NETCDF4_CURL}, 1) - SYSLIBS += ${NETCDF4_CURL_LIBS} + NETCDF_SYSLIBS += ${NETCDF4_CURL_LIBS} endif else DEFINES += -DHAVE_NETCDF - SYSLIBS += ${NETCDF_LIBS} + NETCDF_SYSLIBS += ${NETCDF_LIBS} endif + SYSLIBS += ${NETCDF_SYSLIBS} endif + ifeq (${HAVE_MDCORE},1) SYSLIBS += -L${MDCORE_LIBDIR} ${MDCORE_LIBS} INCLUDES += -I${MDCORE_INCDIR}