"make distcheck" now passes

diff --git a/cgi/Makefile.am b/cgi/Makefile.am
index 2e126deca756fd77cad641e13e8682063bade346..86f69653915247b52b336c312c03471fad4433a4 100644 (file)
--- a/cgi/Makefile.am
+++ b/cgi/Makefile.am
@@ -22,9 +22,8 @@ noinst_PROGRAMS=disorder.cgi
 
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 
-disorder_cgi_SOURCES=macros-disorder.c macros-disorder.h lookup.c      \
-       lookup.h options.c options.h actions.c actions.h login.c        \
-       login.h cgimain.c
+disorder_cgi_SOURCES=macros-disorder.c lookup.c options.c actions.c    \
+       login.c cgimain.c disorder-cgi.h
 disorder_cgi_LDADD=../lib/libdisorder.a \
        $(LIBPCRE) $(LIBGCRYPT) $(LIBDL) $(LIBDB)
 disorder_cgi_LDFLAGS=-export-dynamic

diff --git a/disobedience/Makefile.am b/disobedience/Makefile.am
index 0b1433b1124fa43d5c2eee3ebae1b50fb3c0953f..8c492737798e40fb61908189c8e19482b35a5298 100644 (file)
--- a/disobedience/Makefile.am
+++ b/disobedience/Makefile.am
@@ -65,4 +65,6 @@ check-help: all
        unset DISPLAY;./disobedience --version > /dev/null
        unset DISPLAY;./disobedience --help > /dev/null
 
+CLEANFILES=disobedience.html images.h
+
 export GNUSED

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7ae24e4051083c28c8f9aa01becb8048985f90cc..8a8b1888a899fa440bf2293a998d44a0e15ccb07 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -84,6 +84,7 @@ EXTRA_DIST=disorderd.8.in disorder.1.in disorder_config.5.in \
           disorder_actions.5.tail disorder_templates.5.tail \
           disorder_options.5.in disorder.cgi.8.in
 
-CLEANFILES=$(SEDFILES) $(HTMLMAN) $(TMPLMAN)
+CLEANFILES=$(SEDFILES) $(HTMLMAN) $(TMPLMAN) \
+       disorder_actions.5.in disorder_templates.5.in
 
 export GNUSED

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7f25cdde488b08a477f452eb81b6b32b165a896c..95f6d01926ac42f79d442ede41da327e7036ef32 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -74,7 +74,7 @@ libdisorder_a_SOURCES=charset.c charset.h             \
        speaker-protocol.c speaker-protocol.h           \
        split.c split.h                                 \
        syscalls.c syscalls.h                           \
-       types.h                                         \
+       common.h                                        \
        table.c table.h                                 \
        timeval.h                                       \
        $(TRACKDB) trackdb.h trackdb-int.h              \
@@ -125,6 +125,6 @@ rebuild-unicode:
        $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) -c $< > $@.new
        mv $@.new $@
 
-CLEANFILES=definitions.h definitions.h.new
+CLEANFILES=definitions.h definitions.h.new version-string versionstring.h
 
 EXTRA_DIST=trackdb.c trackdb-stub.c

diff --git a/libtests/Makefile.am b/libtests/Makefile.am
index 8a70152abe50a184b763c0bcef281852fc90c277..f5fbb00d73eb64f2b8fb87d20967f69048253411 100644 (file)
--- a/libtests/Makefile.am
+++ b/libtests/Makefile.am
@@ -69,3 +69,6 @@ make-coverage-reports:
        ${GCOV} *.c | ${PYTHON} ../scripts/format-gcov-report --html . *.c
 
 EXTRA_DIST=t-macros-1.tmpl t-macros-2
+
+DISTCLEANFILES=GraphemeBreakTest.txt NormalizationTest.txt     \
+              WordBreakTest.txt

diff --git a/server/Makefile.am b/server/Makefile.am
index 35571586a5635c17ff53fa8bd3a3b03acb7d4b59..3f776755ec52320769629bb3f0f7f9a913d9212a 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -27,14 +27,14 @@ AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 
 disorderd_SOURCES=disorderd.c api.c api-server.c daemonize.c play.c    \
        server.c server-queue.c queue-ops.c state.c plugin.c            \
-       schedule.c exports.c ../lib/memgc.c
+       schedule.c exports.c ../lib/memgc.c disorder-server.h
 disorderd_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
        $(LIBPCRE) $(LIBDB) $(LIBAO) $(LIBGC) $(LIBGCRYPT) $(LIBICONV) \
        $(LIBASOUND) $(COREAUDIO)
 disorderd_LDFLAGS=-export-dynamic
 disorderd_DEPENDENCIES=../lib/libdisorder.a
 
-disorder_deadlock_SOURCES=deadlock.c
+disorder_deadlock_SOURCES=deadlock.c disorder-server.h
 disorder_deadlock_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
        $(LIBDB) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
 disorder_deadlock_DEPENDENCIES=../lib/libdisorder.a
@@ -49,46 +49,46 @@ disorder_speaker_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
        $(LIBASOUND) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT) $(COREAUDIO)
 disorder_speaker_DEPENDENCIES=../lib/libdisorder.a
 
-disorder_decode_SOURCES=decode.c
+disorder_decode_SOURCES=decode.c disorder-server.h
 disorder_decode_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
        $(LIBMAD) $(LIBVORBISFILE) $(LIBFLAC)
 disorder_decode_DEPENDENCIES=../lib/libdisorder.a
 
-disorder_normalize_SOURCES=normalize.c
+disorder_normalize_SOURCES=normalize.c disorder-server.h
 disorder_normalize_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
        $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
 disorder_normalize_DEPENDENCIES=../lib/libdisorder.a
 
 disorder_rescan_SOURCES=rescan.c plugin.c api.c api-server.c exports.c \
-       ../lib/memgc.c
+       ../lib/memgc.c disorder-server.h
 disorder_rescan_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
        $(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
 disorder_rescan_LDFLAGS=-export-dynamic
 disorder_rescan_DEPENDENCIES=../lib/libdisorder.a
 
-disorder_choose_SOURCES=choose.c server-queue.c ../lib/memgc.c
+disorder_choose_SOURCES=choose.c server-queue.c ../lib/memgc.c \
+                       disorder-server.h
 disorder_choose_LDADD=$(LIBOBJS) ../lib/libdisorder.a   \
        $(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBGCRYPT)
 disorder_choose_LDFLAGS=-export-dynamic
 disorder_choose_DEPENDENCIES=../lib/libdisorder.a
 
-disorder_stats_SOURCES=stats.c
+disorder_stats_SOURCES=stats.c disorder-server.h
 disorder_stats_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
        $(LIBDB) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
 disorder_stats_DEPENDENCIES=../lib/libdisorder.a
 
-disorder_dump_SOURCES=dump.c                                   \
-       ../lib/memgc.c
+disorder_dump_SOURCES=dump.c disorder-server.h ../lib/memgc.c
 disorder_dump_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
        $(LIBPCRE) $(LIBDB) $(LIBICONV) $(LIBGC) $(LIBGCRYPT)
 disorder_dump_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
 
-disorder_dbupgrade_SOURCES=dbupgrade.c ../lib/memgc.c
+disorder_dbupgrade_SOURCES=dbupgrade.c ../lib/memgc.c disorder-server.h
 disorder_dbupgrade_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
        $(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
 disorder_dbupgrade_DEPENDENCIES=../lib/libdisorder.a
 
-trackname_SOURCES=trackname.c
+trackname_SOURCES=trackname.c disorder-server.h
 trackname_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
 trackname_DEPENDENCIES=../lib/libdisorder.a