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

app/Makefile.am

-## Process this file with automake to produce Makefile.in
-#
 bin_PROGRAMS    =
 noinst_PROGRAMS =
 check_PROGRAMS  =
+
 if ENABLE_CDI_APP
 if ENABLE_CDI_LIB
 bin_PROGRAMS += cdi
@@ -13,24 +12,26 @@ noinst_PROGRAMS += createtable
 else !ENABLE_CDI_APP
 check_PROGRAMS += cdi
 endif !ENABLE_CDI_APP
-#
-#
-cdi_SOURCES         = cdi.c printinfo.c printinfo.h
-cdi_LDADD           = $(top_builddir)/src/libcdi.la $(LIBS)
+
+AM_CPPFLAGS = -I$(top_srcdir)/src
+
+cdi_SOURCES = \
+  cdi.c \
+  printinfo.c \
+  printinfo.h
+cdi_LDADD = $(top_builddir)/src/libcdi.la $(LIBS)
 if ENABLE_ALL_STATIC
-cdi_LDFLAGS         = -all-static
+cdi_LDFLAGS = -all-static
 endif
-#
+
 createtable_SOURCES = createtable.c
-createtable_LDADD   = $(top_builddir)/src/libcdi.la
+createtable_LDADD = $(top_builddir)/src/libcdi.la
 if ENABLE_ALL_STATIC
 createtable_LDFLAGS = -all-static
 endif
-#
-AM_CPPFLAGS         = -I$(top_srcdir)/src
-#
-CLEANFILES          = `ls *~`
-#
+
+CLEANFILES = `ls *~`
+
 clean-local: clean-local-dirs
 .PHONY: clean-local-dirs
 clean-local-dirs: