hash.c tests

[disorder] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index e9b41f89055ecf967c745eae5eae5c0b7e6a1359..67416b2a0f57548603a9c4f389a1bce82883f554 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2004, 2005, 2006, s007 Richard Kettlewell
+# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -38,7 +38,6 @@ libdisorder_a_SOURCES=charset.c charset.h             \
        hash.c hash.h                                   \
        heap.h                                          \
        hex.c hex.h                                     \
-       html.c html.h                                   \
        ifreq.c ifreq.h                                 \
        inputline.c inputline.h                         \
        kvp.c kvp.h                                     \
@@ -64,11 +63,12 @@ libdisorder_a_SOURCES=charset.c charset.h           \
        timeval.h                                       \
        trackname.c trackname.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 casefold.h unicodegc.h          \
        wstat.c wstat.h                                 \
        disorder.h
 
@@ -81,19 +81,29 @@ definitions.h: Makefile
        echo "#define SBINDIR \"${sbindir}/\"" >> $@.new
        echo "#define BINDIR \"${bindir}/\"" >> $@.new
        echo "#define FINKBINDIR \"${finkbindir}/\"" >> $@.new
+       echo "#define DOCDIR \"${docdir}/\"" >> $@.new
        @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
 
-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
+
 %.i: %.c
        $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) -c $< > $@.new
        mv $@.new $@