X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/4f8132b3d83dc46d4ab2321ef5b838da406bd100..533272be9795de994b1bc3280315364f48a32dd1:/lib/Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index fe6a661..be12f1c 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		\
 	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				\
@@ -60,12 +60,12 @@ libdisorder_a_SOURCES=charset.c charset.h		\
 	macros.c macros-builtin.c macros.h		\
 	mem.c mem.h 					\
 	mime.h mime.c					\
-	mixer.c mixer.h mixer-oss.c mixer-alsa.c	\
 	printf.c printf.h				\
 	asprintf.c fprintf.c snprintf.c			\
 	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				\
@@ -82,15 +82,16 @@ libdisorder_a_SOURCES=charset.c charset.h		\
 	$(TRACKDB) trackdb.h trackdb-int.h		\
 	trackname.c trackorder.c trackname.h		\
 	tracksort.c					\
-	uaudio.c uaudio-thread.c uaudio.h		\
+	uaudio.c uaudio-thread.c uaudio.h uaudio-apis.c	\
 	uaudio-oss.c uaudio-alsa.c 			\
 	uaudio-coreaudio.c				\
-	uaudio-rtp.c					\
+	uaudio-rtp.c uaudio-command.c uaudio-schedule.c	\
 	url.h url.c					\
 	user.h user.c					\
 	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					\
@@ -121,6 +122,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
@@ -134,10 +136,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