big autotools update, cleanup

Author: [email protected]

Makefile.am

@@ -1,284 +1 @@
-
-SOURCES = \
-	src/modp_b2.c src/modp_b2.h \
-	src/modp_b16.c src/modp_b16.h modp_b16_data.h \
-	src/modp_b64.c src/modp_b64.h modp_b64_data.h \
-	src/modp_b64w.c src/modp_b64w.h modp_b64w_data.h \
-	src/modp_b64r.c src/modp_b64r.h modp_b64r_data.h \
-	src/modp_b85.h src/modp_b85.c modp_b85_data.h \
-	src/modp_burl.h src/modp_burl.c src/modp_burl_data.h \
-	src/modp_bjavascript.h src/modp_bjavascript.c \
-	src/modp_numtoa.h src/modp_numtoa.c \
-	src/modp_qsiter.h src/modp_qsiter.c \
-	src/modp_xml.h src/modp_xml.c \
-	src/modp_ascii.h src/modp_ascii.c modp_ascii_data.h \
-	src/modp_utf8.h src/modp_utf8.c \
-	src/modp_html.h src/modp_html.c \
-	src/modp_json.h src/modp_json.c \
-	src/modp_messagepack.h src/modp_messagepack.c
-
-lib_LTLIBRARIES = libmodpbase64.la
-libmodpbase64_la_SOURCES = ${SOURCES}
-
-libmodpbase64_la_DEPENDENCIES = \
-	modp_b2_data.h modp_b2_gen \
-	modp_b16_data.h modp_b16_gen \
-	modp_b64_data.h modp_b64w_data.h modp_b64r_data.h modp_b64_gen \
-	modp_b85_data.h modp_b85_gen \
-	modp_ascii_data.h modp_ascii_gen
-
-include_HEADERS = \
-	src/modp_b16.h src/modp_b64.h src/modp_b64w.h src/modp_b64r.h \
-	src/modp_b85.h src/modp_burl.h src/modp_bjavascript.h \
-	src/modp_numtoa.h src/modp_ascii.h src/modp_b2.h \
-	src/modp_qsiter.h src/modp_xml.h src/modp_html.h src/modp_json.h
-
-CLEANFILES = *.log \
-	*~ src/*~ test/*~ \
-	*.tmp src/*.tmp test/*.tmp \
-	doxy/html/* \
-	doxy/*.tmp \
-	m4 \
-	*.loT \
-	*.ll *.ll.out \
-	*.gcda *.gcno *.gcov stringencoders.info \
-	modp_b16_data.h modp_b64_data.h modp_b85_data.h \
-	modp_b64w_data.h src/modp_b64w.c test/modp_b64w_test.c \
-	modp_b64r_data.h src/modp_b64r.c test/modp_b64r_test.c \
-	modp_ascii_data.h modp_b2_data.h \
-	modp_xml_test modp_qsiter_test modp_html_test modp_json_test \
-	cxx_test
-
-superclean:
-	rm -rf autom4te.cache
-	rm -rf lcov-html/html
-	rm -f Makefile.in aclocal.m4 autom4te.cache config.guess config.h.in config.sub configure
-	rm -f ltmain.sh depcomp install-sh missing
-
-src/modp_b2.c: src/modp_b2.h modp_b2_data.h
-
-src/modp_b16.c: src/modp_b16.h modp_b16_data.h
-
-src/modp_b64.c: src/modp_b64.h modp_b64_data.h
-
-src/modp_b64r.c: src/modp_b64.c src/modp_b64r.h modp_b64r_data.h
-	perl -p -i -e 's/b64/b64r/g' < src/modp_b64.c > src/modp_b64r.c
-
-src/modp_b64w.c: src/modp_b64.c src/modp_b64w.h modp_b64w_data.h
-	perl -p -i -e 's/b64/b64w/g' < src/modp_b64.c > src/modp_b64w.c
-
-src/modp_b85.c: src/modp_b85.h modp_b85_data.h
-
-src/modp_burl.c: src/modp_burl.h src/modp_burl_data.h
-
-src/modp_bjavascript.c: src/modp_bjavascript.h src/modp_bjavascript_data.h
-
-src/modp_json.c: src/modp_json.h src/modp_json_data.h
-
-src/modp_ascii.c: src/modp_ascii.h modp_ascii_data.h
-
-src/modp_qsiter.c: src/modp_qsiter.h
-
-src/modp_xml.c: src/modp_xml.h
-
-modp_b2_data.h: modp_b2_gen
-	./modp_b2_gen > modp_b2_data.h
-
-modp_b16_data.h: modp_b16_gen
-	./modp_b16_gen > modp_b16_data.h
-
-modp_b64_data.h: modp_b64_gen
-	./modp_b64_gen > modp_b64_data.h
-
-modp_ascii_data.h: modp_ascii_gen
-	./modp_ascii_gen > modp_ascii_data.h
-
-#
-# Recall B64WCHARS by default is "-_."
-#
-modp_b64w_data.h: modp_b64_gen
-	./modp_b64_gen $(B64WCHARS) > modp_b64w_data.h
-
-#
-# RFC 4648 alphabet is -_=
-# http://www.ietf.org/rfc/rfc4648.txt
-modp_b64r_data.h: modp_b64_gen
-	./modp_b64_gen "-_=" > modp_b64r_data.h
-
-modp_b85_data.h: modp_b85_gen
-	./modp_b85_gen > modp_b85_data.h
-
-modp_burl_data.h: modp_burl_gen
-	./modp_burl_gen > modp_burl_data.h
-
-src/modp_bjavascript_data.h: modp_bjavascript_gen
-	./modp_bjavascript_gen > src/modp_bjavascript_data.h
-
-noinst_PROGRAMS = \
-	modp_b2_gen modp_b16_gen modp_b64_gen modp_b85_gen \
-	modp_burl_gen modp_ascii_gen \
-	modp_b2_test \
-	modp_b16_test modp_b64_test modp_b64w_test modp_b64r_test \
-	modp_b85_test modp_burl_test \
-	modp_bjavascript_gen modp_bjavascript_test \
-	modp_numtoa_test modp_ascii_test modp_xml_test \
-	modp_html_test \
-	modp_qsiter_test \
-	modp_utf8_test \
-	modp_json_test \
-	cxx_test \
-	speedtest speedtest_numtoa speedtest_ascii speedtest_msg
-
-modp_b2_gen_SOURCES = src/arraytoc.c src/modp_b2_gen.c
-modp_b16_gen_SOURCES = src/arraytoc.c src/modp_b16_gen.c
-modp_b64_gen_SOURCES = src/arraytoc.c src/modp_b64_gen.c
-modp_b85_gen_SOURCES = src/arraytoc.c src/modp_b85_gen.c
-modp_burl_gen_SOURCES = src/arraytoc.c src/modp_burl_gen.c
-modp_ascii_gen_SOURCES = src/arraytoc.c src/modp_ascii_gen.c
-modp_bjavascript_gen_SOURCES = src/arraytoc.c src/modp_bjavascript_gen.c
-
-speedtest_SOURCES = test/apr_base64.h test/apr_base64.c test/speedtest.c
-speedtest_LDADD = libmodpbase64.la
-
-speedtest_numtoa_SOURCES = test/speedtest_numtoa.c
-speedtest_numtoa_LDADD = libmodpbase64.la
-
-speedtest_msg_SOURCES = test/speedtest_msg.c
-speedtest_msg_LDADD = libmodpbase64.la
-
-test/speedtest_ascii.c: modp_ascii_data.h
-speedtest_ascii_SOURCES = test/speedtest_ascii.c
-speedtest_ascii_LDADD = libmodpbase64.la
-
-modp_b2_test_SOURCES = test/modp_b2_test.c
-modp_b2_test_LDADD = libmodpbase64.la
-
-modp_b16_test_SOURCES = test/modp_b16_test.c
-modp_b16_test_LDADD = libmodpbase64.la
-
-modp_b64_test_SOURCES = test/modp_b64_test.c
-modp_b64_test_LDADD = libmodpbase64.la
-
-test/modp_b64w_test.c: test/modp_b64_test.c
-	perl -p -i -e 's/b64/b64w/g' < test/modp_b64_test.c > test/modp_b64w_test.c
-
-modp_b64w_test_SOURCES = test/modp_b64w_test.c
-modp_b64w_test_LDADD = libmodpbase64.la
-
-test/modp_b64r_test.c: test/modp_b64_test.c
-	perl -p -i -e 's/b64/b64r/g' < test/modp_b64_test.c > test/modp_b64r_test.c
-
-modp_b64r_test_SOURCES = test/modp_b64r_test.c
-modp_b64r_test_LDADD = libmodpbase64.la
-
-modp_b85_test_SOURCES = test/modp_b85_test.c
-modp_b85_test_LDADD = libmodpbase64.la
-
-modp_burl_test_SOURCES = test/modp_burl_test.c
-modp_burl_test_LDADD = libmodpbase64.la
-
-modp_bjavascript_test_SOURCES = test/modp_bjavascript_test.c
-modp_bjavascript_test_LDADD = libmodpbase64.la
-
-modp_numtoa_test_SOURCES = test/modp_numtoa_test.c
-modp_numtoa_test_LDADD = libmodpbase64.la
-
-modp_ascii_test_SOURCES = test/modp_ascii_test.c
-modp_ascii_test_LDADD = libmodpbase64.la
-
-modp_xml_test_SOURCES = test/modp_xml_test.c
-modp_xml_test_LDADD = libmodpbase64.la
-
-modp_html_test_SOURCES = test/modp_html_test.c
-modp_html_test_LDADD = libmodpbase64.la
-
-modp_qsiter_test_SOURCES = test/modp_qsiter_test.c
-modp_qsiter_test_LDADD = libmodpbase64.la
-
-modp_utf8_test_SOURCES = test/modp_utf8_test.c
-modp_utf8_test_LDADD = libmodpbase64.la
-
-modp_json_test_SOURCES = test/modp_json_test.c
-modp_json_test_LDADD = libmodpbase64.la
-
-cxx_test_SOURCES = test/cxx_test.cc
-cxx_test_LDADD = libmodpbase64.la
-
-.PHONY: test unittest perftest doxy lcov-html help
-help:
-	@echo ""
-	@echo "make -- make everything"
-	@echo "make install -- install everything"
-	@echo "make test -- run unit and performance tests"
-	@echo "make unittest -- run only unit tests"
-	@echo "make perftest -- run only performance tests"
-	@echo "make doxy -- generate doxygen output"
-	@echo "make lcov-html -- make test + generate lcov html output"
-	@echo ""
-
-lcov-html:
-	lcov -b . --directory . --zerocounters
-	@make unittest
-	lcov -b . --directory . --capture --output-file stringencoders.info
-	lcov -b . --directory . --remove stringencoders.info '*arraytoc.c' -o stringencoders.info
-	lcov -b . --directory . --remove stringencoders.info '*test*' -o stringencoders.info
-	lcov -b . --directory . --remove stringencoders.info '*_gen.c' -o stringencoders.info
-	lcov -b . --directory . --remove stringencoders.info '/usr/include*' -o stringencoders.info
-	rm -rf lcov-html/html
-	mkdir lcov-html/html
-	genhtml --branch-coverage -o lcov-html/html stringencoders.info
-
-test: unittest speedtest
-
-
-
-valgrind: modp_b16_test modp_b64_test modp_b64w_test modp_b64r_test modp_b85_test modp_b2_test modp_burl_test modp_bjavascript_test modp_numtoa_test modp_ascii_test modp_xml_test modp_qsiter_test modp_utf8_test modp_html_test cxx_test
-	@find . -name '*.da' | xargs rm -f
-	${LIBTOOL} --mode=execute valgrind --leak-check=full --error-exitcode=1 ./modp_b16_test
-	${LIBTOOL} --mode=execute valgrind --leak-check=full --error-exitcode=1 ./modp_b64_test
-	${LIBTOOL} --mode=execute valgrind --leak-check=full --error-exitcode=1 ./modp_b64w_test
-	${LIBTOOL} --mode=execute valgrind --leak-check=full --error-exitcode=1 ./modp_b64r_test
-	${LIBTOOL} --mode=execute valgrind --leak-check=full --error-exitcode=1 ./modp_b85_test
-	${LIBTOOL} --mode=execute valgrind --leak-check=full --error-exitcode=1 ./modp_b2_test
-	${LIBTOOL} --mode=execute valgrind --leak-check=full --error-exitcode=1 ./modp_burl_test
-	${LIBTOOL} --mode=execute valgrind --leak-check=full --error-exitcode=1 ./modp_bjavascript_test
-	${LIBTOOL} --mode=execute valgrind --leak-check=full --error-exitcode=1 ./modp_numtoa_test
-	${LIBTOOL} --mode=execute valgrind --leak-check=full --error-exitcode=1 ./modp_ascii_test
-	${LIBTOOL} --mode=execute valgrind --leak-check=full --error-exitcode=1 ./modp_xml_test
-	${LIBTOOL} --mode=execute valgrind --leak-check=full --error-exitcode=1 ./modp_html_test
-	${LIBTOOL} --mode=execute valgrind --leak-check=full --error-exitcode=1 ./modp_qsiter_test
-	${LIBTOOL} --mode=execute valgrind --leak-check=full --error-exitcode=1 ./modp_utf8_test
-	${LIBTOOL} --mode=execute valgrind --leak-check=full --error-exitcode=1 ./modp_json_test
-	${LIBTOOL} --mode=execute valgrind --leak-check=full --error-exitcode=1 ./cxx_test
-
-.PHONY: valgrind
-
-unittest: modp_b16_test modp_b64_test modp_b64w_test modp_b64r_test modp_b85_test modp_b2_test modp_burl_test modp_bjavascript_test modp_numtoa_test modp_ascii_test modp_xml_test modp_html_test cxx_test modp_qsiter_test modp_utf8_test modp_json_test
-	@find . -name '*da' | xargs rm -fr
-	@./modp_b16_test
-	@./modp_b64_test
-	@./modp_b64w_test
-	@./modp_b64r_test
-	@./modp_b85_test
-	@./modp_b2_test
-	@./modp_burl_test
-	@./modp_bjavascript_test
-	@./modp_numtoa_test
-	@./modp_ascii_test
-	@./modp_xml_test
-	@./modp_html_test
-	@./modp_qsiter_test
-	@./modp_utf8_test
-	@./modp_json_test
-	@./cxx_test
-
-perftest: speedtest speedtest_numtoa speedtest_ascii
-	./speedtest
-	./speedtest_numtoa
-	./speedtest_ascii
-
-.PHONY: doxy
-
-doxy: ${SOURCES} doxy/header.html doxy/footer.html Doxyfile
-	doxygen Doxyfile
-
+SUBDIRS = src test

bootstrap.sh

@@ -1,25 +1,3 @@
 #!/bin/sh
-
-#
-# script to regen the autotools
-#  glibtoolize might be "libtoolize" on your system
-#
-set -x
-aclocal
-
-# test for MacPorts version first
-#  Mac version of libtool is bizarro
-if [ "`which glibtoolize`" != "" ]; then
-   LIBTOOLIZE=glibtoolize
-elif [ "`which libtool`" != "" ]; then
-   LIBTOOLIZE=libtoolize
-else
-   echo "Perhap you need to install libtool?"
-   exit 1
-fi
-echo "Using ${LIBTOOLIZE}..."
-
-${LIBTOOLIZE} --force --copy
-autoheader
-automake --add-missing --copy
-autoconf
+autoreconf --install
+automake --add-missing >/dev/null 2>&1