Merge branch 'develop'

Juniper · Jun 3, 2021 · 260a81b · 260a81b
2 parents ba01cd3 + 50f9b68
commit 260a81b
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 40 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -10,7 +10,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = libxo xo xopo xolint xohtml tests doc encoder
+SUBDIRS = bin libxo xo xopo xolint xohtml tests doc encoder
 bin_SCRIPTS=libxo-config
 dist_doc_DATA = Copyright
 

diff --git a/bin/Makefile.am b/bin/Makefile.am
@@ -6,24 +6,4 @@
 # using the SOFTWARE, you agree to be bound by the terms of that
 # LICENSE.
 
-ACLOCAL_AMFLAGS = -I m4
-
-EXTRA_DIST = gt setup.sh
-
-GT_INSTALL_DIR = ${prefix}/bin
-GT_INSTALL_FILES = gt
-
-install-data-hook:
-	@echo "Installing gt ... "
-	@-mkdir -p ${GT_INSTALL_DIR}
-	@for file in ${GT_INSTALL_FILES} ; do \
-		if [ -f $$file ]; then \
-			rfile=$$file ; \
-		else \
-			rfile=${srcdir}/$$file ; \
-		fi ; \
-		mdir=${GT_INSTALL_DIR}/ ; \
-		mkdir -p $$mdir ; \
-		cp $$rfile $$mdir/ ; \
-        done
-	@${CHMOD} a+x ${GT_INSTALL_DIR}/gt
+EXTRA_DIST = setup.sh
diff --git a/configure.ac b/configure.ac
@@ -11,8 +11,8 @@
 # a particular user has the dist or svn release.
 #
 
-AC_PREREQ(2.2)
-AC_INIT([libxo], [1.5.1], [phil@juniper.net])
+AC_PREREQ([2.69])
+AC_INIT([libxo],[1.5.1],[phil@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.
@@ -38,8 +38,6 @@ AC_PATH_PROG(MV, mv, /bin/mv)
 AC_PATH_PROG(RM, rm, /bin/rm)
 AC_PATH_PROG(SED, sed, /bin/sed)
 
-AC_STDC_HEADERS
-
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
 AC_TYPE_SIZE_T
@@ -451,6 +449,7 @@ AC_CONFIG_FILES([
   xohtml/xohtml.sh
   libxo/Makefile
   libxo/add.man
+  bin/Makefile
   encoder/Makefile
   encoder/cbor/Makefile
   encoder/csv/Makefile

diff --git a/tests/core/Makefile.am b/tests/core/Makefile.am
@@ -51,24 +51,32 @@ endif
 
 EXTRA_DIST = \
     ${TEST_CASES} \
-    ${addprefix saved/, ${TEST_CASES:.c=.T.err}} \
-    ${addprefix saved/, ${TEST_CASES:.c=.T.out}} \
-    ${addprefix saved/, ${TEST_CASES:.c=.XP.err}} \
-    ${addprefix saved/, ${TEST_CASES:.c=.XP.out}} \
-    ${addprefix saved/, ${TEST_CASES:.c=.JP.err}} \
-    ${addprefix saved/, ${TEST_CASES:.c=.JP.out}} \
-    ${addprefix saved/, ${TEST_CASES:.c=.HP.err}} \
-    ${addprefix saved/, ${TEST_CASES:.c=.HP.out}} \
-    ${addprefix saved/, ${TEST_CASES:.c=.X.err}} \
-    ${addprefix saved/, ${TEST_CASES:.c=.X.out}} \
-    ${addprefix saved/, ${TEST_CASES:.c=.J.err}} \
-    ${addprefix saved/, ${TEST_CASES:.c=.J.out}} \
+    ${addprefix saved/, ${TEST_CASES:.c=.E.err}} \
+    ${addprefix saved/, ${TEST_CASES:.c=.E.out}} \
     ${addprefix saved/, ${TEST_CASES:.c=.H.err}} \
     ${addprefix saved/, ${TEST_CASES:.c=.H.out}} \
     ${addprefix saved/, ${TEST_CASES:.c=.HIPx.err}} \
     ${addprefix saved/, ${TEST_CASES:.c=.HIPx.out}} \
-    ${addprefix saved/, ${TEST_CASES:.c=.E.err}} \
-    ${addprefix saved/, ${TEST_CASES:.c=.E.out}}
+    ${addprefix saved/, ${TEST_CASES:.c=.HP.err}} \
+    ${addprefix saved/, ${TEST_CASES:.c=.HP.out}} \
+    ${addprefix saved/, ${TEST_CASES:.c=.J.err}} \
+    ${addprefix saved/, ${TEST_CASES:.c=.J.out}} \
+    ${addprefix saved/, ${TEST_CASES:.c=.JP.err}} \
+    ${addprefix saved/, ${TEST_CASES:.c=.JP.out}} \
+    ${addprefix saved/, ${TEST_CASES:.c=.JPu.err}} \
+    ${addprefix saved/, ${TEST_CASES:.c=.JPu.out}} \
+    ${addprefix saved/, ${TEST_CASES:.c=.T.err}} \
+    ${addprefix saved/, ${TEST_CASES:.c=.T.out}} \
+    ${addprefix saved/, ${TEST_CASES:.c=.X.err}} \
+    ${addprefix saved/, ${TEST_CASES:.c=.X.out}} \
+    ${addprefix saved/, ${TEST_CASES:.c=.XP.err}} \
+    ${addprefix saved/, ${TEST_CASES:.c=.XP.out}} \
+    ${addprefix saved/, test_01.Ecsv1.out} \
+    ${addprefix saved/, test_01.Ecsv1.err} \
+    ${addprefix saved/, test_01.Ecsv2.out} \
+    ${addprefix saved/, test_01.Ecsv2.err} \
+    ${addprefix saved/, test_01.Ecsv3.out} \
+    ${addprefix saved/, test_01.Ecsv3.err}
 
 S2O = | ${SED} '1,/@@/d'