Only optionally build cfortran-dependent part of libcdi.

src/Makefile.am

@@ -28,8 +28,6 @@ libcdi_la_SOURCES = 	 \
 	cdi_error.c      \
 	cdi_limits.h	 \
 	cdi_util.c       \
-	cdiFortran.c     \
-	cfortran.h       \
 	cgribex.h	 \
 	cgribexlib.c  	 \
 	datetime.h	 \
@@ -118,6 +116,19 @@ libcdi_la_SOURCES = 	 \
         stream.c         \
         swap.c
 
+# cfortran.h is an optional part of libcdi
+libcdi_la_USE_FC_extra_sources = \
+	cfortran.h       \
+	cdiFortran.c
+
+if USE_FC
+libcdi_la_SOURCES+ = 	 \
+	$(libcdi_la_USE_FC_extra_sources)
+endif
+EXTRA_DIST += \
+	$(libcdi_la_USE_FC_extra_sources)
+
+
 if HAVE_LIBGRIB_API
 libcdi_la_SOURCES +=        \
 	iterator.c          \

src/Makefile.in

@@ -168,42 +168,41 @@ am__DEPENDENCIES_1 =
 libcdi_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am__libcdi_la_SOURCES_DIST = basetime.c basetime.h binary.c binary.h \
 	calendar.c calendar.h cdf.c cdf.h cdf_int.c cdf_int.h cdi.h \
-	cdi_error.c cdi_limits.h cdi_util.c cdiFortran.c cfortran.h \
-	cgribex.h cgribexlib.c datetime.h dmemory.c dmemory.h cksum.c \
-	cksum.h cdi_cksum.c cdi_cksum.h create_uuid.h dtypes.h error.c \
-	error.h extra.h extralib.c file.c file.h gaussgrid.c \
-	gaussgrid.h gribapi.c gribapi.h gribapi_utilities.c \
-	gribapi_utilities.h grid.c grid.h ieg.h ieglib.c input_file.c \
-	input_file.h institution.c institution.h model.c model.h \
-	namespace.c namespace.h serialize.h serialize.c \
-	referenceCounting.c referenceCounting.h resource_handle.c \
-	resource_handle.h service.h servicelib.c stream_cdf.c \
-	stream_cdf.h stream_cgribex.c stream_cgribex.h stream_ext.c \
-	stream_ext.h stream_grb.c stream_grb.h stream_gribapi.c \
-	stream_gribapi.h stream_history.c stream_ieg.c stream_ieg.h \
-	stream_fcommon.c stream_fcommon.h cdi_int.c cdi_int.h \
-	stream_record.c stream_srv.c stream_srv.h stream_var.c swap.h \
-	table.c table.h tablepar.h taxis.c taxis.h timebase.c \
-	timebase.h tsteps.c util.c varscan.c varscan.h version.c \
-	vlist.c vlist.h vlist_att.c vlist_att.h vlist_var.c \
-	vlist_var.h zaxis.c zaxis.h stream.c swap.c iterator.c \
-	iterator.h iterator_fallback.c iterator_fallback.h \
-	iterator_grib.c iterator_grib.h
+	cdi_error.c cdi_limits.h cdi_util.c cgribex.h cgribexlib.c \
+	datetime.h dmemory.c dmemory.h cksum.c cksum.h cdi_cksum.c \
+	cdi_cksum.h create_uuid.h dtypes.h error.c error.h extra.h \
+	extralib.c file.c file.h gaussgrid.c gaussgrid.h gribapi.c \
+	gribapi.h gribapi_utilities.c gribapi_utilities.h grid.c \
+	grid.h ieg.h ieglib.c input_file.c input_file.h institution.c \
+	institution.h model.c model.h namespace.c namespace.h \
+	serialize.h serialize.c referenceCounting.c \
+	referenceCounting.h resource_handle.c resource_handle.h \
+	service.h servicelib.c stream_cdf.c stream_cdf.h \
+	stream_cgribex.c stream_cgribex.h stream_ext.c stream_ext.h \
+	stream_grb.c stream_grb.h stream_gribapi.c stream_gribapi.h \
+	stream_history.c stream_ieg.c stream_ieg.h stream_fcommon.c \
+	stream_fcommon.h cdi_int.c cdi_int.h stream_record.c \
+	stream_srv.c stream_srv.h stream_var.c swap.h table.c table.h \
+	tablepar.h taxis.c taxis.h timebase.c timebase.h tsteps.c \
+	util.c varscan.c varscan.h version.c vlist.c vlist.h \
+	vlist_att.c vlist_att.h vlist_var.c vlist_var.h zaxis.c \
+	zaxis.h stream.c swap.c iterator.c iterator.h \
+	iterator_fallback.c iterator_fallback.h iterator_grib.c \
+	iterator_grib.h
 @HAVE_LIBGRIB_API_TRUE@am__objects_1 = iterator.lo \
 @HAVE_LIBGRIB_API_TRUE@	iterator_fallback.lo iterator_grib.lo
 am_libcdi_la_OBJECTS = basetime.lo binary.lo calendar.lo cdf.lo \
-	cdf_int.lo cdi_error.lo cdi_util.lo cdiFortran.lo \
-	cgribexlib.lo dmemory.lo cksum.lo cdi_cksum.lo error.lo \
-	extralib.lo file.lo gaussgrid.lo gribapi.lo \
-	gribapi_utilities.lo grid.lo ieglib.lo input_file.lo \
-	institution.lo model.lo namespace.lo serialize.lo \
-	referenceCounting.lo resource_handle.lo servicelib.lo \
-	stream_cdf.lo stream_cgribex.lo stream_ext.lo stream_grb.lo \
-	stream_gribapi.lo stream_history.lo stream_ieg.lo \
-	stream_fcommon.lo cdi_int.lo stream_record.lo stream_srv.lo \
-	stream_var.lo table.lo taxis.lo timebase.lo tsteps.lo util.lo \
-	varscan.lo version.lo vlist.lo vlist_att.lo vlist_var.lo \
-	zaxis.lo stream.lo swap.lo $(am__objects_1)
+	cdf_int.lo cdi_error.lo cdi_util.lo cgribexlib.lo dmemory.lo \
+	cksum.lo cdi_cksum.lo error.lo extralib.lo file.lo \
+	gaussgrid.lo gribapi.lo gribapi_utilities.lo grid.lo ieglib.lo \
+	input_file.lo institution.lo model.lo namespace.lo \
+	serialize.lo referenceCounting.lo resource_handle.lo \
+	servicelib.lo stream_cdf.lo stream_cgribex.lo stream_ext.lo \
+	stream_grb.lo stream_gribapi.lo stream_history.lo \
+	stream_ieg.lo stream_fcommon.lo cdi_int.lo stream_record.lo \
+	stream_srv.lo stream_var.lo table.lo taxis.lo timebase.lo \
+	tsteps.lo util.lo varscan.lo version.lo vlist.lo vlist_att.lo \
+	vlist_var.lo zaxis.lo stream.lo swap.lo $(am__objects_1)
 libcdi_la_OBJECTS = $(am_libcdi_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -487,7 +486,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 #
-EXTRA_DIST = cdilib.c mo_cdi.f90
+EXTRA_DIST = cdilib.c mo_cdi.f90 $(libcdi_la_USE_FC_extra_sources)
 noinst_LTLIBRARIES = libcdiresunpack.la $(am__append_1) \
 	$(am__append_5)
 @ENABLE_CDI_LIB_TRUE@lib_LTLIBRARIES = libcdi.la $(am__append_3)
@@ -495,25 +494,30 @@ noinst_LTLIBRARIES = libcdiresunpack.la $(am__append_1) \
 AM_CFLAGS = $(PPM_CORE_CFLAGS) $(YAXT_CFLAGS) $(MPI_C_INCLUDE)
 libcdi_la_SOURCES = basetime.c basetime.h binary.c binary.h calendar.c \
 	calendar.h cdf.c cdf.h cdf_int.c cdf_int.h cdi.h cdi_error.c \
-	cdi_limits.h cdi_util.c cdiFortran.c cfortran.h cgribex.h \
-	cgribexlib.c datetime.h dmemory.c dmemory.h cksum.c cksum.h \
-	cdi_cksum.c cdi_cksum.h create_uuid.h dtypes.h error.c error.h \
-	extra.h extralib.c file.c file.h gaussgrid.c gaussgrid.h \
-	gribapi.c gribapi.h gribapi_utilities.c gribapi_utilities.h \
-	grid.c grid.h ieg.h ieglib.c input_file.c input_file.h \
-	institution.c institution.h model.c model.h namespace.c \
-	namespace.h serialize.h serialize.c referenceCounting.c \
-	referenceCounting.h resource_handle.c resource_handle.h \
-	service.h servicelib.c stream_cdf.c stream_cdf.h \
-	stream_cgribex.c stream_cgribex.h stream_ext.c stream_ext.h \
-	stream_grb.c stream_grb.h stream_gribapi.c stream_gribapi.h \
-	stream_history.c stream_ieg.c stream_ieg.h stream_fcommon.c \
-	stream_fcommon.h cdi_int.c cdi_int.h stream_record.c \
-	stream_srv.c stream_srv.h stream_var.c swap.h table.c table.h \
-	tablepar.h taxis.c taxis.h timebase.c timebase.h tsteps.c \
-	util.c varscan.c varscan.h version.c vlist.c vlist.h \
-	vlist_att.c vlist_att.h vlist_var.c vlist_var.h zaxis.c \
-	zaxis.h stream.c swap.c $(am__append_2)
+	cdi_limits.h cdi_util.c cgribex.h cgribexlib.c datetime.h \
+	dmemory.c dmemory.h cksum.c cksum.h cdi_cksum.c cdi_cksum.h \
+	create_uuid.h dtypes.h error.c error.h extra.h extralib.c \
+	file.c file.h gaussgrid.c gaussgrid.h gribapi.c gribapi.h \
+	gribapi_utilities.c gribapi_utilities.h grid.c grid.h ieg.h \
+	ieglib.c input_file.c input_file.h institution.c institution.h \
+	model.c model.h namespace.c namespace.h serialize.h \
+	serialize.c referenceCounting.c referenceCounting.h \
+	resource_handle.c resource_handle.h service.h servicelib.c \
+	stream_cdf.c stream_cdf.h stream_cgribex.c stream_cgribex.h \
+	stream_ext.c stream_ext.h stream_grb.c stream_grb.h \
+	stream_gribapi.c stream_gribapi.h stream_history.c \
+	stream_ieg.c stream_ieg.h stream_fcommon.c stream_fcommon.h \
+	cdi_int.c cdi_int.h stream_record.c stream_srv.c stream_srv.h \
+	stream_var.c swap.h table.c table.h tablepar.h taxis.c taxis.h \
+	timebase.c timebase.h tsteps.c util.c varscan.c varscan.h \
+	version.c vlist.c vlist.h vlist_att.c vlist_att.h vlist_var.c \
+	vlist_var.h zaxis.c zaxis.h stream.c swap.c $(am__append_2)
+
+# cfortran.h is an optional part of libcdi
+libcdi_la_USE_FC_extra_sources = \
+	cfortran.h       \
+	cdiFortran.c
+
 libcdiresunpack_la_SOURCES = \
 	resource_unpack.c
 
@@ -679,7 +683,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/calendar.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdf.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdf_int.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdiFortran.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdi_cksum.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdi_error.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdi_int.Plo@am__quote@
@@ -1012,6 +1015,9 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
 	tags tags-am uninstall uninstall-am uninstall-includeHEADERS \
 	uninstall-libLTLIBRARIES uninstall-local
 
+
+@USE_FC_TRUE@libcdi_la_SOURCES+ = 	 \
+@USE_FC_TRUE@	$(libcdi_la_USE_FC_extra_sources)
 #
 mo_cdi.f90: $(top_srcdir)/src/cdi.h $(top_srcdir)/interfaces/f2003/bindGen.rb
 	ruby $(top_srcdir)/interfaces/f2003/bindGen.rb $(top_srcdir)/src/cdi.h $@