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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1dacb38..eea6220 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -20,19 +20,19 @@ noinst_LIBRARIES=libdisorder.a
 include_HEADERS=disorder.h
 
 if SERVER
-TRACKDB=trackdb.c
+TRACKDB=trackdb.c trackdb-playlists.c
 else
 TRACKDB=trackdb-stub.c
 endif
 
-libdisorder_a_SOURCES=charset.c charset.h		\
+libdisorder_a_SOURCES=charset.c charsetf.c charset.h	\
 	addr.c addr.h					\
-	alsabg.c alsabg.h				\
 	arcfour.c arcfour.h				\
 	authhash.c authhash.h				\
 	basen.c basen.h					\
 	base64.c base64.h				\
 	bits.c bits.h					\
+	byte-order.h					\
 	cache.c cache.h					\
 	cgi.c cgi.h					\
 	client.c client.h				\
@@ -52,6 +52,7 @@ libdisorder_a_SOURCES=charset.c charset.h		\
 	heap.h						\
 	hex.c hex.h					\
 	hostname.c hostname.h				\
+	hreader.c hreader.h				\
 	ifreq.c ifreq.h					\
 	inputline.c inputline.h				\
 	kvp.c kvp.h					\
@@ -65,6 +66,7 @@ libdisorder_a_SOURCES=charset.c charset.h		\
 	queue.c queue.h					\
 	random.c random.h				\
 	regsub.c regsub.h				\
+	resample.c resample.h				\
 	rights.c queue-rights.c rights.h		\
 	rtp.h						\
 	selection.c selection.h				\
@@ -90,6 +92,7 @@ libdisorder_a_SOURCES=charset.c charset.h		\
 	unicode.h unicode.c				\
 	unidata.h unidata.c				\
 	vacopy.h					\
+	validity.c validity.h				\
 	vector.c vector.h				\
 	version.c version.h				\
 	wav.h wav.c					\
@@ -120,6 +123,7 @@ definitions.h: Makefile
 	echo "#define PKGCONFDIR \"${sysconfdir}/\"PACKAGE" >> $@.new
 	echo "#define PKGSTATEDIR \"${localstatedir}/\"PACKAGE" >> $@.new
 	echo "#define PKGDATADIR \"${pkgdatadir}/\"" >> $@.new
+	echo "#define DOCHTMLDIR \"${dochtmldir}\"" >> $@.new
 	echo "#define SBINDIR \"${sbindir}/\"" >> $@.new
 	echo "#define BINDIR \"${bindir}/\"" >> $@.new
 	echo "#define FINKBINDIR \"${finkbindir}/\"" >> $@.new
@@ -133,10 +137,6 @@ defs.lo: definitions.h versionstring.h
 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 version-string versionstring.h \
 	   *.gcda *.gcov *.gcno *.c.html index.html