Consolidation with CDI-PIO (develop)

Generally, this is !11 (merged) rebased onto the develop branch.

This is the first develop-based version accepted by the Buildbot of ICON: https://buildbot.dkrz.de/grid?branch=m300488/cdi-pio-2-integration

src/Makefile.am

@@ -328,7 +328,7 @@ pkgconfig/cdi_f2003.pc: $(top_builddir)/config.status $(srcdir)/pkgconfig/cdi_f2
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 cdilib.c:
-	$(AM_V_GEN)(cd $(top_srcdir)/src ; ./make_cdilib)
+	$(AM_V_GEN)$(am__cd) $(top_srcdir)/src && ./make_cdilib
 
 CLEANFILES = cdilib.c
 MOSTLYCLEANFILES = make_fint