X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/f74f4f32805a96d5079b90455264a160d91be3af..b94e827f906d4c725ab73a18c02300d32bdfc6a9:/lib/Makefile.am?ds=inline

diff --git a/lib/Makefile.am b/lib/Makefile.am
index ec674f6..f2f15f7 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, 2012, 2013 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/>.
 #
@@ -35,14 +35,14 @@ libdisorder_a_SOURCES=charset.c charsetf.c charset.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				\
 	coreaudio.c coreaudio.h				\
 	dateparse.c dateparse.h xgetdate.c		\
 	defs.c defs.h					\
-	eclient.c eclient.h				\
+	eclient.c eclient.h eclient-stubs.h		\
 	email.c						\
 	eventdist.c eventdist.h				\
 	event.c event.h 				\
@@ -52,6 +52,7 @@ libdisorder_a_SOURCES=charset.c charsetf.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					\
@@ -75,7 +76,7 @@ libdisorder_a_SOURCES=charset.c charsetf.c charset.h	\
 	speaker-protocol.c speaker-protocol.h		\
 	split.c split.h					\
 	strptime.c strptime.h				\
-	syscalls.c syscalls.h				\
+	syscalls.c syscallsrt.c syscalls.h		\
 	common.h					\
 	table.c table.h					\
 	timeval.h					\
@@ -84,6 +85,7 @@ libdisorder_a_SOURCES=charset.c charsetf.c charset.h	\
 	tracksort.c					\
 	uaudio.c uaudio-thread.c uaudio.h uaudio-apis.c	\
 	uaudio-oss.c uaudio-alsa.c 			\
+	uaudio-pulseaudio.c 				\
 	uaudio-coreaudio.c				\
 	uaudio-rtp.c uaudio-command.c uaudio-schedule.c	\
 	url.h url.c					\
@@ -91,8 +93,10 @@ libdisorder_a_SOURCES=charset.c charsetf.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				\
+	versionstring.c					\
 	wav.h wav.c					\
 	wstat.c wstat.h					\
 	disorder.h
@@ -103,7 +107,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
 
-versionstring.h: version-string ${top_srcdir}/scripts/text2c
+versionstring.c: version-string ${top_srcdir}/scripts/text2c
 	${top_srcdir}/scripts/text2c -extern disorder_version_string \
 		version-string > $@.new
 	@if cmp $@.new $@; then \
@@ -121,6 +125,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
@@ -128,17 +133,15 @@ definitions.h: Makefile
 	@if cmp $@.new $@; then \
 		echo rm -f $@.new; rm -f $@.new; else \
 		echo mv $@.new $@; mv $@.new $@; fi
-defs.o: definitions.h versionstring.h
-defs.lo: definitions.h versionstring.h
+defs.o: definitions.h
+defs.lo: definitions.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 eclient-stubs.c