mo_cdi.f90: update

config/default

@@ -15,6 +15,7 @@ case "${HOSTNAME}" in
     bailung*)
 	./configure --prefix=$HOME/local \
                     --enable-maintainer-mode \
+                    --enable-iso-c-interface \
                     --enable-swig \
                     --enable-python \
                     --with-jasper=/opt/local \
@@ -41,6 +42,7 @@ case "${HOSTNAME}" in
     hama*)
 	./configure --prefix=$HOME/local \
                     --enable-maintainer-mode \
+                    --enable-iso-c-interface \
                     --enable-swig \
                     --enable-python \
                     --with-jasper=/opt/local \

examples/Makefile.am

@@ -7,34 +7,34 @@ if CREATE_ISOC
   noinst_PROGRAMS += cdi_read_f2003 cdi_write_f2003
 endif
 #
-AM_CPPFLAGS             = -I$(top_srcdir)/src
-AM_FCFLAGS              = $(FPP_INCOPT)$(top_srcdir)/src $(FC_MOD_FLAG)../src
+AM_CPPFLAGS              = -I$(top_srcdir)/src
+AM_FCFLAGS               = $(FPP_INCOPT)$(top_srcdir)/src $(FC_MOD_FLAG)../src
 #
-cdi_write_SOURCES       = cdi_write.c
-cdi_write_LDADD         = $(top_builddir)/src/libcdi.la
+cdi_write_SOURCES        = cdi_write.c
+cdi_write_LDADD          = $(top_builddir)/src/libcdi.la
 #
-cdi_write_ens_SOURCES   = cdi_write_ens.c
-cdi_write_ens_LDADD     = $(top_builddir)/src/libcdi.la
+cdi_write_ens_SOURCES    = cdi_write_ens.c
+cdi_write_ens_LDADD      = $(top_builddir)/src/libcdi.la
 #
-cdi_write_hybrid_SOURCES   = cdi_write_hybrid.c
-cdi_write_hybrid_LDADD     = $(top_builddir)/src/libcdi.la
+cdi_write_hybrid_SOURCES = cdi_write_hybrid.c
+cdi_write_hybrid_LDADD   = $(top_builddir)/src/libcdi.la
 #
-cdi_read_SOURCES        = cdi_read.c
-cdi_read_LDADD          = $(top_builddir)/src/libcdi.la
+cdi_read_SOURCES         = cdi_read.c
+cdi_read_LDADD           = $(top_builddir)/src/libcdi.la
 #
-cdi_copy_SOURCES        = cdi_copy.c
-cdi_copy_LDADD          = $(top_builddir)/src/libcdi.la
+cdi_copy_SOURCES         = cdi_copy.c
+cdi_copy_LDADD           = $(top_builddir)/src/libcdi.la
+#
+cdi_read_f2003_SOURCES   = cdi_read_f2003.f90
+cdi_read_f2003_LDADD     = $(top_builddir)/src/libcdi.la $(top_builddir)/src/mo_cdi.o
+#
+cdi_write_f2003_SOURCES  = cdi_write_f2003.f90
+cdi_write_f2003_LDADD    = $(top_builddir)/src/libcdi.la $(top_builddir)/src/mo_cdi.o
 #
 if ENABLE_ALL_STATIC
-cdi_write_LDFLAGS       = -all-static
-cdi_read_LDFLAGS        = -all-static
-cdi_copy_LDFLAGS        = -all-static
+cdi_write_LDFLAGS        = -all-static
+cdi_read_LDFLAGS         = -all-static
+cdi_copy_LDFLAGS         = -all-static
+cdi_read_f2003_LDFLAGS   = -all-static
+cdi_write_f2003_LDFLAGS  = -all-static
 endif
-cdi_read_f2003_SOURCES  = cdi_read_f2003.f90
-cdi_read_f2003_LDADD    = $(top_builddir)/src/libcdi.la $(top_builddir)/src/mo_cdi.o
-cdi_read_f2003_LDFLAGS  = -all-static
-
-cdi_write_f2003_SOURCES = cdi_write_f2003.f90
-cdi_write_f2003_LDADD   = $(top_builddir)/src/libcdi.la $(top_builddir)/src/mo_cdi.o
-cdi_write_f2003_LDFLAGS = -all-static
-

examples/Makefile.in

@@ -360,15 +360,17 @@ cdi_read_LDADD = $(top_builddir)/src/libcdi.la
 cdi_copy_SOURCES = cdi_copy.c
 cdi_copy_LDADD = $(top_builddir)/src/libcdi.la
 #
-@ENABLE_ALL_STATIC_TRUE@cdi_write_LDFLAGS = -all-static
-@ENABLE_ALL_STATIC_TRUE@cdi_read_LDFLAGS = -all-static
-@ENABLE_ALL_STATIC_TRUE@cdi_copy_LDFLAGS = -all-static
 cdi_read_f2003_SOURCES = cdi_read_f2003.f90
 cdi_read_f2003_LDADD = $(top_builddir)/src/libcdi.la $(top_builddir)/src/mo_cdi.o
-cdi_read_f2003_LDFLAGS = -all-static
+#
 cdi_write_f2003_SOURCES = cdi_write_f2003.f90
 cdi_write_f2003_LDADD = $(top_builddir)/src/libcdi.la $(top_builddir)/src/mo_cdi.o
-cdi_write_f2003_LDFLAGS = -all-static
+#
+@ENABLE_ALL_STATIC_TRUE@cdi_write_LDFLAGS = -all-static
+@ENABLE_ALL_STATIC_TRUE@cdi_read_LDFLAGS = -all-static
+@ENABLE_ALL_STATIC_TRUE@cdi_copy_LDFLAGS = -all-static
+@ENABLE_ALL_STATIC_TRUE@cdi_read_f2003_LDFLAGS = -all-static
+@ENABLE_ALL_STATIC_TRUE@cdi_write_f2003_LDFLAGS = -all-static
 all: all-am
 
 .SUFFIXES:

src/Makefile.am

@@ -147,7 +147,7 @@ if CREATE_ISOC
 LOCALTARGETS += mo_cdi.o mo_cdi.$(FCMODEXT)
 endif
 #
-mo_cdi.f90:
+mo_cdi.f90: cdi.h
 	ruby $(top_srcdir)/interfaces/f2003/bindGen.rb cdi.h $@
 #
 mo_cdi.o: mo_cdi.f90

src/Makefile.in

@@ -903,7 +903,7 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
 	uninstall-local
 
 #
-mo_cdi.f90:
+mo_cdi.f90: cdi.h
 	ruby $(top_srcdir)/interfaces/f2003/bindGen.rb cdi.h $@
 #
 mo_cdi.o: mo_cdi.f90