Web interface starts to reflect user rights properly:

[disorder] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 212b1ce015a0107932650f793b5f2a3f6910a941..7b4ce0a61f07a3716efffadcd05a6d057ea0632c 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
@@ -26,17 +26,21 @@ libdisorder_a_SOURCES=charset.c charset.h           \
        addr.c addr.h                                   \
        authhash.c authhash.h                           \
        basen.c basen.h                                 \
+       base64.c base64.h                               \
        cache.c cache.h                                 \
        client.c client.h                               \
        client-common.c client-common.h                 \
        configuration.c configuration.h                 \
+       cookies.c cookies.h                             \
        defs.c defs.h                                   \
        eclient.c eclient.h                             \
        event.c event.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                          \
@@ -49,25 +53,41 @@ libdisorder_a_SOURCES=charset.c charset.h           \
        asprintf.c fprintf.c snprintf.c                 \
        queue.c queue.h                                 \
        regsub.c regsub.h                               \
+       rights.c queue-rights.c rights.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                                       \
+       trackdb.h trackdb.c trackdb-int.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
 
+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
@@ -77,15 +97,31 @@ definitions.h: Makefile
        echo "#define SBINDIR \"${sbindir}/\"" >> $@.new
        echo "#define BINDIR \"${bindir}/\"" >> $@.new
        echo "#define FINKBINDIR \"${finkbindir}/\"" >> $@.new
-       mv $@.new $@
-defs.o: definitions.h
-defs.lo: definitions.h
+       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 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
+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