disorder-udplog exits more reliably when parent dies

[disorder] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0eeccd7ce674480e28b8bf04ef9b0678b9f97c61..cf538787ad21ca437069236eab36282d1ef40077 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -65,14 +65,25 @@ libdisorder_a_SOURCES=charset.c charset.h           \
        user.h user.c                                   \
        unicode.h unicode.c                             \
        unidata.h unidata.c                             \
-       utf8.h utf8.c                                   \
        vacopy.h                                        \
        vector.c vector.h                               \
        wav.h wav.c                                     \
-       words.c words.h                                 \
        wstat.c wstat.h                                 \
        disorder.h
 
+version-string: ../config.status ${top_srcdir}/scripts/make-version-string
+       CC="${CC}" ${top_srcdir}/scripts/make-version-string > $@.new
+       @if cmp $@.new $@; then \
+               echo rm -f $@.new; rm -f $@.new; else \
+               echo mv $@.new $@; mv $@.new $@; fi
+
+version.h: version-string ${top_srcdir}/scripts/text2c
+       ${top_srcdir}/scripts/text2c -extern disorder_version_string \
+               version-string > $@.new
+       @if cmp $@.new $@; then \
+               echo rm -f $@.new; rm -f $@.new; else \
+               echo mv $@.new $@; mv $@.new $@; fi
+
 definitions.h: Makefile
        rm -f $@.new
        echo "#define PKGLIBDIR \"${pkglibdir}\"" > $@.new
@@ -86,16 +97,22 @@ definitions.h: Makefile
        @if cmp $@.new $@; then \
                echo rm -f $@.new; rm -f $@.new; else \
                echo mv $@.new $@; mv $@.new $@; fi
-defs.o: definitions.h
-defs.lo: definitions.h
+defs.o: definitions.h version.h
+defs.lo: definitions.h version.h
 
-test_SOURCES=test.c
-test_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV)
+test_SOURCES=test.c memgc.c
+test_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
 test_DEPENDENCIES=libdisorder.a
 
 check: test #test.i
        ./test
 
+check-report: before-check check make-coverage-reports
+before-check:
+       rm -f *.gcda *.gcov
+make-coverage-reports:
+       ${GCOV} *.c | ${PYTHON} ../scripts/format-gcov-report --html . *.c
+
 rebuild-unicode:
        cd ${srcdir} && ${top_srcdir}/scripts/make-unidata