Skip to content
Snippets Groups Projects

Consolidation with CDI-PIO (develop)

Merged Sergey Kosukhin requested to merge m300488/develop-rebase into develop
2 files
+ 4
10
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 3
6
@@ -16,9 +16,9 @@ AM_CPPFLAGS += -DUSE_MPI
endif ENABLE_MPI
AM_CFLAGS = $(MPI_C_INCLUDE)
AM_FCFLAGS = $(FC_OPTINC)$(top_srcdir)/src $(MPI_FC_INCLUDE)
AM_FCFLAGS = $(FC_OPTINC)$(top_builddir)/src $(FC_OPTINC)$(top_srcdir)/src $(MPI_FC_INCLUDE)
if ENABLE_MPI
AM_FCFLAGS += $(FC_DEFINE)USE_MPI
AM_FCFLAGS += $(FC_DEFINE)USE_MPI $(YAXT_FC_MOD)
endif ENABLE_MPI
AM_LDFLAGS =
@@ -57,7 +57,4 @@ CXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=compile $(CXX) -static $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
PPFCCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=FC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=compile $(FC) -static $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_FCFLAGS) $(FCFLAGS)
PPFCCOMPILE = $(FCCOMPILE)
Loading