X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/bb6ae3fb80fff36cd342d6f6bff3dfabd7dd243e..c3c40090c7a6d155d797e3bdddd2cac704de7a11:/lib/Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index d658f86..000ec0b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
+# Copyright (C) 2004-2008 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
@@ -22,11 +22,19 @@ noinst_LIBRARIES=libdisorder.a
 include_HEADERS=disorder.h
 noinst_PROGRAMS=test
 
+if SERVER
+TRACKDB=trackdb.c
+else
+TRACKDB=trackdb-stub.c
+endif
+
 libdisorder_a_SOURCES=charset.c charset.h		\
 	addr.c addr.h					\
+	alsabg.c alsabg.h				\
 	authhash.c authhash.h				\
 	basen.c basen.h					\
 	base64.c base64.h				\
+	bits.c bits.h					\
 	cache.c cache.h					\
 	client.c client.h				\
 	client-common.c client-common.h			\
@@ -48,7 +56,7 @@ libdisorder_a_SOURCES=charset.c charset.h		\
 	logfd.c logfd.h					\
 	mem.c mem.h mem-impl.h				\
 	mime.h mime.c					\
-	mixer.c mixer.h					\
+	mixer.c mixer.h mixer-oss.c mixer-alsa.c	\
 	plugin.c plugin.h				\
 	printf.c printf.h				\
 	asprintf.c fprintf.c snprintf.c			\
@@ -66,7 +74,7 @@ libdisorder_a_SOURCES=charset.c charset.h		\
 	types.h						\
 	table.c table.h					\
 	timeval.h					\
-	trackdb.h trackdb.c trackdb-int.h		\
+	$(TRACKDB) trackdb.h trackdb-int.h		\
 	trackname.c trackname.h				\
 	url.h url.c					\
 	user.h user.c					\
@@ -74,6 +82,7 @@ libdisorder_a_SOURCES=charset.c charset.h		\
 	unidata.h unidata.c				\
 	vacopy.h					\
 	vector.c vector.h				\
+	version.c version.h				\
 	wav.h wav.c					\
 	wstat.c wstat.h					\
 	disorder.h
@@ -84,7 +93,7 @@ version-string: ../config.status ${top_srcdir}/scripts/make-version-string
 		echo rm -f $@.new; rm -f $@.new; else \
 		echo mv $@.new $@; mv $@.new $@; fi
 
-version.h: version-string ${top_srcdir}/scripts/text2c
+versionstring.h: version-string ${top_srcdir}/scripts/text2c
 	${top_srcdir}/scripts/text2c -extern disorder_version_string \
 		version-string > $@.new
 	@if cmp $@.new $@; then \
@@ -100,14 +109,17 @@ 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 version.h
-defs.lo: definitions.h version.h
+defs.o: definitions.h versionstring.h
+defs.lo: definitions.h versionstring.h
 
-test_SOURCES=test.c memgc.c
+test_SOURCES=test.c memgc.c test.h t-addr.c t-basen.c t-cache.c		\
+	t-casefold.c t-cookies.c t-filepart.c t-hash.c t-heap.c		\
+	t-hex.c t-kvp.c t-mime.c t-printf.c t-regsub.c t-selection.c	\
+	t-signame.c t-sink.c t-split.c t-unicode.c t-url.c t-utf8.c	\
+	t-words.c t-wstat.c t-bits.c t-vector.c t-syscalls.c
 test_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
 test_DEPENDENCIES=libdisorder.a
 
@@ -128,3 +140,5 @@ rebuild-unicode:
 	mv $@.new $@
 
 CLEANFILES=definitions.h definitions.h.new
+
+EXTRA_DIST=trackdb.c trackdb-stub.c