Fix merge artifact in examples Makefile and taxis.c.

examples/Makefile.am

@@ -37,12 +37,5 @@ cdi_read_LDFLAGS         = -all-static
 cdi_copy_LDFLAGS         = -all-static
 cdi_read_f2003_LDFLAGS   = -all-static
 cdi_write_f2003_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_write_f2003_SOURCES = cdi_write_f2003.f90
-cdi_write_f2003_LDADD   = $(top_builddir)/src/libcdi.la $(top_builddir)/src/mo_cdi.o
 

examples/Makefile.in

@@ -366,8 +366,10 @@ cdi_read_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
 #

src/taxis.c

@@ -1406,6 +1406,7 @@ taxisPack(void * voidP, void * packBuffer, int packBufferSize, int * packBufferP
   intBuffer[14] = taxisP->vtime_ub;
   intBuffer[15] = taxisP->name ? strlen(taxisP->name) : 0;
   intBuffer[16] = taxisP->longname ? strlen(taxisP->longname) : 0;
+  intBuffer[17] = taxisP->climatology;
 
   serializePack(intBuffer, taxisNint, DATATYPE_INT,
                 packBuffer, packBufferSize, packBufferPos, context);
@@ -1419,7 +1420,6 @@ taxisPack(void * voidP, void * packBuffer, int packBufferSize, int * packBufferP
     serializePack(taxisP->longname, intBuffer[16], DATATYPE_TXT,
                   packBuffer, packBufferSize, packBufferPos, context);
 
-  intBuffer[17] = taxisP->climatology;
 }
 
 /*