Skip to content

Commit

Permalink
adding directories and Makefile.am changes to support fortran netcdf …
Browse files Browse the repository at this point in the history
…integration
  • Loading branch information
edhartnett committed Jul 7, 2019
1 parent 08e7b2b commit ed9f6c5
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 3 deletions.
2 changes: 2 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -296,11 +296,13 @@ AC_OUTPUT(Makefile
src/Makefile
src/clib/Makefile
src/ncint/Makefile
src/fncint/Makefile
src/flib/Makefile
src/gptl/Makefile
tests/Makefile
tests/cunit/Makefile
tests/ncint/Makefile
tests/fncint/Makefile
tests/unit/Makefile
tests/general/Makefile
tests/general/util/Makefile
Expand Down
7 changes: 5 additions & 2 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Does the user want to build fortran?
if BUILD_FORTRAN
FLIB = flib
endif
endif # BUILD_FORTRAN

# Are we building with the GPTL timing library?
if USE_GPTL
Expand All @@ -15,9 +15,12 @@ endif
# Are we building with netCDF integration?
if BUILD_NCINT
NCINT = ncint
if BUILD_FORTRAN
FNCINT = fncint
endif # BUILD_FORTRAN
endif # BUILD_NCINT

# Build these subdirectories.
SUBDIRS = ${NCINT} clib ${GPTL} $(FLIB)
SUBDIRS = ${NCINT} clib ${GPTL} $(FNCINT) $(FLIB)

EXTRA_DIST = CMakeLists.txt
12 changes: 12 additions & 0 deletions src/fncint/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
## This is the automake file to build the PIO netCDF integration
## layer for the PIO fortran library.
# Ed Hartnett 7/7/19

# Find pio.h.
AM_CPPFLAGS = -I$(top_srcdir)/src/clib

# This is our output. The ncint convenience library.
#noinst_LTLIBRARIES = libfncint.la

# The source files.
#libfncint_la_SOURCES = ncintdispatch.c ncintdispatch.h ncint_pio.c
5 changes: 4 additions & 1 deletion tests/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ endif # BUILD_FORTRAN
# Are we building with netCDF integration?
if BUILD_NCINT
NCINT = ncint
if BUILD_FORTRAN
FNCINT = fncint
endif # BUILD_FORTRAN
endif # BUILD_NCINT

# Build in these subdirs.
SUBDIRS = cunit ${UNIT} ${NCINT} ${GENERAL} ${PERFORMANCE}
SUBDIRS = cunit ${UNIT} ${NCINT} ${GENERAL} ${PERFORMANCE} ${FNCINT}

EXTRA_DIST = CMakeLists.txt
27 changes: 27 additions & 0 deletions tests/fncint/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
## This is the automake file for building the netCDF integration layer
## tests.

# Ed Hartnett 7/3/19

# Put together AM_CPPFLAGS and AM_LDFLAGS.
AM_CPPFLAGS = -I$(top_srcdir)/src/clib
LDADD = ${top_builddir}/src/clib/libpioc.la

# Build the test for make check.
#check_PROGRAMS = tst_pio_udf

#if RUN_TESTS
# Tests will run from a bash script.
#TESTS = run_tests.sh
#endif # RUN_TESTS

# if RUN_TESTS
# # Tests will run from a bash script.
# TESTS = run_tests.sh
# endif # RUN_TESTS

# Distribute the test script.
#EXTRA_DIST = run_tests.sh

# Clean up files produced during testing.
#CLEANFILES = *.nc *.log

0 comments on commit ed9f6c5

Please sign in to comment.