From c1978f3f791ed9c1fd859812da49a4c1af92c588 Mon Sep 17 00:00:00 2001 From: Norbert Podhorszki Date: Thu, 8 Mar 2018 12:53:37 -0500 Subject: [PATCH] build utils/ with nompi library instead of internal library so that adios can be built again with flexpath --- configure.ac | 16 ++++++++-------- utils/adios_lint/Makefile.am | 6 +++--- utils/bp2ascii/Makefile.am | 6 +++--- utils/bp2ncd/Makefile.am | 8 ++++---- utils/bpdump/Makefile.am | 6 +++--- utils/bpmeta/Makefile.am | 6 +++--- utils/bprecover/Makefile.am | 6 +++--- utils/bpsplit/Makefile.am | 20 ++++++++++---------- 8 files changed, 37 insertions(+), 37 deletions(-) diff --git a/configure.ac b/configure.ac index ac90c1159..f807f11e2 100644 --- a/configure.ac +++ b/configure.ac @@ -569,16 +569,16 @@ if test -z "${HAVE_PAMI_TRUE}"; then ADIOSREADLIB_SEQ_LDADD="${ADIOSREADLIB_SEQ_LDADD} ${PAMI_LIBS}" fi if test -z "${HAVE_NETCDF_TRUE}"; then - ADIOSLIB_INT_CPPFLAGS="${ADIOSLIB_INT_CPPFLAGS} ${NETCDF_CPPFLAGS}" - ADIOSLIB_INT_CFLAGS="${ADIOSLIB_INT_CFLAGS} ${NETCDF_CFLAGS}" - ADIOSLIB_INT_LDFLAGS="${ADIOSLIB_INT_LDFLAGS} ${NETCDF_LDFLAGS}" - ADIOSLIB_INT_LDADD="${ADIOSLIB_INT_LDADD} ${NETCDF_LIBS}" + ADIOSLIB_SEQ_CPPFLAGS="${ADIOSLIB_SEQ_CPPFLAGS} ${NETCDF_CPPFLAGS}" + ADIOSLIB_SEQ_CFLAGS="${ADIOSLIB_SEQ_CFLAGS} ${NETCDF_CFLAGS}" + ADIOSLIB_SEQ_LDFLAGS="${ADIOSLIB_SEQ_LDFLAGS} ${NETCDF_LDFLAGS}" + ADIOSLIB_SEQ_LDADD="${ADIOSLIB_SEQ_LDADD} ${NETCDF_LIBS}" fi if test -z "${HAVE_HDF5_TRUE}"; then - ADIOSLIB_INT_CPPFLAGS="${ADIOSLIB_INT_CPPFLAGS} ${HDF5_CPPFLAGS}" - ADIOSLIB_INT_CFLAGS="${ADIOSLIB_INT_CFLAGS} ${HDF5_CFLAGS}" - ADIOSLIB_INT_LDFLAGS="${ADIOSLIB_INT_LDFLAGS} ${HDF5_LDFLAGS}" - ADIOSLIB_INT_LDADD="${ADIOSLIB_INT_LDADD} ${HDF5_LIBS}" + ADIOSLIB_SEQ_CPPFLAGS="${ADIOSLIB_SEQ_CPPFLAGS} ${HDF5_CPPFLAGS}" + ADIOSLIB_SEQ_CFLAGS="${ADIOSLIB_SEQ_CFLAGS} ${HDF5_CFLAGS}" + ADIOSLIB_SEQ_LDFLAGS="${ADIOSLIB_SEQ_LDFLAGS} ${HDF5_LDFLAGS}" + ADIOSLIB_SEQ_LDADD="${ADIOSLIB_SEQ_LDADD} ${HDF5_LIBS}" fi if test -z "${HAVE_DMALLOC_TRUE}"; then ADIOSLIB_CPPFLAGS="${ADIOSLIB_CPPFLAGS} ${MACRODEFFLAG}DMALLOC ${DMALLOC_CPPFLAGS}" diff --git a/utils/adios_lint/Makefile.am b/utils/adios_lint/Makefile.am index 0b9ad6801..3d058f56f 100644 --- a/utils/adios_lint/Makefile.am +++ b/utils/adios_lint/Makefile.am @@ -6,8 +6,8 @@ AUTOMAKE_OPTIONS = no-dependencies bin_PROGRAMS=adios_lint adios_lint_SOURCES = adios_lint.c -adios_lint_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSLIB_INT_CPPFLAGS) $(ADIOSLIB_INT_CFLAGS) -adios_lint_LDFLAGS = $(ADIOSLIB_INT_LDFLAGS) $(ADIOSLIB_EXTRA_LDFLAGS) +adios_lint_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSLIB_SEQ_CPPFLAGS) $(ADIOSLIB_SEQ_CFLAGS) +adios_lint_LDFLAGS = $(ADIOSLIB_SEQ_LDFLAGS) $(ADIOSLIB_EXTRA_LDFLAGS) adios_lint_LDADD = $(top_builddir)/src/libadios_nompi.a -adios_lint_LDADD += $(ADIOSLIB_INT_LDADD) +adios_lint_LDADD += $(ADIOSLIB_SEQ_LDADD) diff --git a/utils/bp2ascii/Makefile.am b/utils/bp2ascii/Makefile.am index a98ea499f..457e0dbec 100644 --- a/utils/bp2ascii/Makefile.am +++ b/utils/bp2ascii/Makefile.am @@ -6,8 +6,8 @@ AUTOMAKE_OPTIONS = no-dependencies noinst_PROGRAMS = bp2ascii bp2ascii_SOURCES = bp2ascii.c -bp2ascii_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSLIB_INT_CPPFLAGS) $(ADIOSLIB_INT_CFLAGS) -bp2ascii_LDFLAGS = $(ADIOSLIB_INT_LDFLAGS) $(ADIOSLIB_EXTRA_LDFLAGS) +bp2ascii_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSLIB_SEQ_CPPFLAGS) $(ADIOSLIB_SEQ_CFLAGS) +bp2ascii_LDFLAGS = $(ADIOSLIB_SEQ_LDFLAGS) $(ADIOSLIB_EXTRA_LDFLAGS) bp2ascii_LDADD = $(top_builddir)/src/libadios_nompi.a -bp2ascii_LDADD += $(ADIOSLIB_INT_LDADD) +bp2ascii_LDADD += $(ADIOSLIB_SEQ_LDADD) diff --git a/utils/bp2ncd/Makefile.am b/utils/bp2ncd/Makefile.am index 3b4cc7d95..2015d238f 100644 --- a/utils/bp2ncd/Makefile.am +++ b/utils/bp2ncd/Makefile.am @@ -13,10 +13,10 @@ if USE_PARALLEL_NETCDF_FOR_UTILS bp2ncd_LDFLAGS = $(ADIOSLIB_LDFLAGS) -static-libtool-libs bp2ncd_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) else - bp2ncd_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSLIB_INT_CPPFLAGS) $(ADIOSLIB_INT_CFLAGS) - bp2ncd_LDFLAGS = $(ADIOSLIB_INT_LDFLAGS) $(ADIOSLIB_EXTRA_LDFLAGS) -static-libtool-libs - bp2ncd_LDADD = $(top_builddir)/src/libadios_internal_nompi.a - bp2ncd_LDADD += $(ADIOSLIB_INT_LDADD) + bp2ncd_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSLIB_SEQ_CPPFLAGS) $(ADIOSLIB_SEQ_CFLAGS) + bp2ncd_LDFLAGS = $(ADIOSLIB_SEQ_LDFLAGS) $(ADIOSLIB_EXTRA_LDFLAGS) -static-libtool-libs + bp2ncd_LDADD = $(top_builddir)/src/libadios_nompi.a + bp2ncd_LDADD += $(ADIOSLIB_SEQ_LDADD) endif CC=$(BP2NCD_CC) diff --git a/utils/bpdump/Makefile.am b/utils/bpdump/Makefile.am index 199539ca1..b0d523b43 100644 --- a/utils/bpdump/Makefile.am +++ b/utils/bpdump/Makefile.am @@ -6,8 +6,8 @@ AUTOMAKE_OPTIONS = no-dependencies bin_PROGRAMS = bpdump bpdump_SOURCES = bpdump.c -bpdump_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSLIB_INT_CPPFLAGS) $(ADIOSLIB_INT_CFLAGS) -bpdump_LDFLAGS = $(ADIOSLIB_INT_LDFLAGS) $(ADIOSLIB_EXTRA_LDFLAGS) +bpdump_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSLIB_SEQ_CPPFLAGS) $(ADIOSLIB_SEQ_CFLAGS) +bpdump_LDFLAGS = $(ADIOSLIB_SEQ_LDFLAGS) $(ADIOSLIB_EXTRA_LDFLAGS) bpdump_LDADD = $(top_builddir)/src/libadios_nompi.a -bpdump_LDADD += $(ADIOSLIB_INT_LDADD) +bpdump_LDADD += $(ADIOSLIB_SEQ_LDADD) diff --git a/utils/bpmeta/Makefile.am b/utils/bpmeta/Makefile.am index 85a1be8aa..b6f9e9d24 100644 --- a/utils/bpmeta/Makefile.am +++ b/utils/bpmeta/Makefile.am @@ -6,8 +6,8 @@ AUTOMAKE_OPTIONS = no-dependencies bin_PROGRAMS = bpmeta bpmeta_SOURCES = bpmeta.c -bpmeta_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSLIB_INT_CPPFLAGS) $(ADIOSLIB_INT_CFLAGS) -bpmeta_LDFLAGS = $(ADIOSLIB_INT_LDFLAGS) $(ADIOSLIB_EXTRA_LDFLAGS) $(PTHREAD_LIBS) +bpmeta_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSLIB_SEQ_CPPFLAGS) $(ADIOSLIB_SEQ_CFLAGS) +bpmeta_LDFLAGS = $(ADIOSLIB_SEQ_LDFLAGS) $(ADIOSLIB_EXTRA_LDFLAGS) $(PTHREAD_LIBS) bpmeta_LDADD = $(top_builddir)/src/libadios_nompi.a -bpmeta_LDADD += $(ADIOSLIB_INT_LDADD) +bpmeta_LDADD += $(ADIOSLIB_SEQ_LDADD) diff --git a/utils/bprecover/Makefile.am b/utils/bprecover/Makefile.am index bec427c00..f4485010c 100644 --- a/utils/bprecover/Makefile.am +++ b/utils/bprecover/Makefile.am @@ -6,8 +6,8 @@ AUTOMAKE_OPTIONS = no-dependencies bin_PROGRAMS = bprecover bprecover_SOURCES = bprecover.c -bprecover_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSLIB_INT_CPPFLAGS) $(ADIOSLIB_INT_CFLAGS) -bprecover_LDFLAGS = $(ADIOSLIB_INT_LDFLAGS) $(ADIOSLIB_EXTRA_LDFLAGS) +bprecover_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSLIB_SEQ_CPPFLAGS) $(ADIOSLIB_SEQ_CFLAGS) +bprecover_LDFLAGS = $(ADIOSLIB_SEQ_LDFLAGS) $(ADIOSLIB_EXTRA_LDFLAGS) bprecover_LDADD = $(top_builddir)/src/libadios_nompi.a -bprecover_LDADD += $(ADIOSLIB_INT_LDADD) +bprecover_LDADD += $(ADIOSLIB_SEQ_LDADD) diff --git a/utils/bpsplit/Makefile.am b/utils/bpsplit/Makefile.am index c0ffa1313..e6d58ffba 100644 --- a/utils/bpsplit/Makefile.am +++ b/utils/bpsplit/Makefile.am @@ -6,20 +6,20 @@ AUTOMAKE_OPTIONS = no-dependencies bin_PROGRAMS = bpsplit bpappend bpgettime bpsplit_SOURCES = bpsplit.c -bpsplit_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSLIB_INT_CPPFLAGS) $(ADIOSLIB_INT_CFLAGS) -bpsplit_LDFLAGS = $(ADIOSLIB_INT_LDFLAGS) $(ADIOSLIB_EXTRA_LDFLAGS) +bpsplit_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSLIB_SEQ_CPPFLAGS) $(ADIOSLIB_SEQ_CFLAGS) +bpsplit_LDFLAGS = $(ADIOSLIB_SEQ_LDFLAGS) $(ADIOSLIB_EXTRA_LDFLAGS) bpsplit_LDADD = $(top_builddir)/src/libadios_nompi.a -bpsplit_LDADD += $(ADIOSLIB_INT_LDADD) +bpsplit_LDADD += $(ADIOSLIB_SEQ_LDADD) bpappend_SOURCES = bpappend.c -bpappend_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSLIB_INT_CPPFLAGS) $(ADIOSLIB_INT_CFLAGS) -bpappend_LDFLAGS = $(ADIOSLIB_INT_LDFLAGS) $(ADIOSLIB_EXTRA_LDFLAGS) +bpappend_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSLIB_SEQ_CPPFLAGS) $(ADIOSLIB_SEQ_CFLAGS) +bpappend_LDFLAGS = $(ADIOSLIB_SEQ_LDFLAGS) $(ADIOSLIB_EXTRA_LDFLAGS) bpappend_LDADD = $(top_builddir)/src/libadios_nompi.a -bpappend_LDADD += $(ADIOSLIB_INT_LDADD) +bpappend_LDADD += $(ADIOSLIB_SEQ_LDADD) bpgettime_SOURCES = bpgettime.c -bpgettime_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSLIB_INT_CPPFLAGS) $(ADIOSLIB_INT_CFLAGS) -bpgettime_LDFLAGS = $(ADIOSLIB_INT_LDFLAGS) $(ADIOSLIB_EXTRA_LDFLAGS) -bpgettime_LDADD = $(top_builddir)/src/libadios_internal_nompi.a -bpgettime_LDADD += $(ADIOSLIB_INT_LDADD) +bpgettime_CPPFLAGS = $(AM_CPPFLAGS) $(ADIOSLIB_EXTRA_CPPFLAGS) $(ADIOSLIB_SEQ_CPPFLAGS) $(ADIOSLIB_SEQ_CFLAGS) +bpgettime_LDFLAGS = $(ADIOSLIB_SEQ_LDFLAGS) $(ADIOSLIB_EXTRA_LDFLAGS) +bpgettime_LDADD = $(top_builddir)/src/libadios_nompi.a +bpgettime_LDADD += $(ADIOSLIB_SEQ_LDADD)