more testing

[disorder] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 195d8645abd239c72a2c0f2ff122c2fffda18844..ab856a797bc513635cb0a1213023101d4b4294ad 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,6 @@
-
 #
 # This file is part of DisOrder.
-# Copyright (C) 2004, 2005, 2006 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
@@ -37,7 +36,9 @@ libdisorder_a_SOURCES=charset.c charset.h             \
        eventlog.c eventlog.h                           \
        filepart.c filepart.h                           \
        hash.c hash.h                                   \
+       heap.h                                          \
        hex.c hex.h                                     \
+       ifreq.c ifreq.h                                 \
        inputline.c inputline.h                         \
        kvp.c kvp.h                                     \
        log.c log.h log-impl.h                          \
@@ -50,25 +51,25 @@ libdisorder_a_SOURCES=charset.c charset.h           \
        asprintf.c fprintf.c snprintf.c                 \
        queue.c queue.h                                 \
        regsub.c regsub.h                               \
+       rtp.h                                           \
        selection.c selection.h                         \
        signame.c signame.h                             \
        sink.c sink.h                                   \
-       speaker.c speaker.h                             \
+       speaker-protocol.c speaker-protocol.h           \
        split.c split.h                                 \
        syscalls.c syscalls.h                           \
        types.h                                         \
        table.c table.h                                 \
+       timeval.h                                       \
        trackname.c trackname.h                         \
        user.h user.c                                   \
-       utf8.h utf8.c                                   \
+       unicode.h unicode.c                             \
+       unidata.h unidata.c                             \
        vacopy.h                                        \
        vector.c vector.h                               \
-       words.c words.h casefold.h unicodegc.h          \
+       wav.h wav.c                                     \
        wstat.c wstat.h                                 \
        disorder.h
-#libdisorder_la_LIBADD=$(LIBGCRYPT) $(LIBGC) $(LIBICONV) $(LIBNSL) \
-#      $(LIBSOCKET) $(LIBDL) $(LIBPCRE)
-#libdisorder_la_LDFLAGS=-release ${VERSION}
 
 definitions.h: Makefile
        rm -f $@.new
@@ -76,15 +77,34 @@ definitions.h: Makefile
        echo "#define PKGCONFDIR \"${sysconfdir}/\"PACKAGE" >> $@.new
        echo "#define PKGSTATEDIR \"${localstatedir}/\"PACKAGE" >> $@.new
        echo "#define PKGDATADIR \"${pkgdatadir}/\"" >> $@.new
-       mv $@.new $@
+       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) $(LIBGC)
+test_SOURCES=test.c memgc.c
+test_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
 test_DEPENDENCIES=libdisorder.a
 
-check: test
+check: test #test.i
        ./test
 
-CLEANFILES=definitions.h
+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 $@
+
+CLEANFILES=definitions.h definitions.h.new