X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/61b761862db3feb9bd0135a64ac3729f70917f89..0c1d42ad03f7e49b23755209f5b1f295cbe21f6b:/lib/Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index d0890e1..c8ac6a9 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,17 +1,17 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2004-2009 Richard Kettlewell
+# Copyright (C) 2004-2010 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
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
@@ -20,21 +20,22 @@ 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					\
 	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				\
+	client.c client.h client-stubs.h		\
 	client-common.c client-common.h			\
 	configuration.c configuration.h			\
 	cookies.c cookies.h				\
@@ -51,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					\
@@ -64,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				\
@@ -78,7 +81,6 @@ libdisorder_a_SOURCES=charset.c charset.h		\
 	table.c table.h					\
 	timeval.h					\
 	$(TRACKDB) trackdb.h trackdb-int.h		\
-	trackdb-playlists.c				\
 	trackname.c trackorder.c trackname.h		\
 	tracksort.c					\
 	uaudio.c uaudio-thread.c uaudio.h uaudio-apis.c	\
@@ -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
@@ -130,14 +134,12 @@ definitions.h: Makefile
 defs.o: definitions.h versionstring.h
 defs.lo: definitions.h versionstring.h
 
+client.o: client-stubs.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 version-string versionstring.h \
 	   *.gcda *.gcov *.gcno *.c.html index.html
 
-EXTRA_DIST=trackdb.c trackdb-stub.c
+EXTRA_DIST=trackdb.c trackdb-stub.c client-stubs.c