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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 000ec0b..ca0e82d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,25 +2,22 @@
 # This file is part of DisOrder.
 # Copyright (C) 2004-2008 Richard Kettlewell
 #
-# This program is free software; you can redistribute it and/or modify
+# 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 2 of the License, or
+# 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.
-#
+# 
+# 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 noinst_LIBRARIES=libdisorder.a
 include_HEADERS=disorder.h
-noinst_PROGRAMS=test
 
 if SERVER
 TRACKDB=trackdb.c
@@ -31,17 +28,22 @@ 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					\
 	cache.c cache.h					\
+	cgi.c cgi.h					\
 	client.c client.h				\
 	client-common.c client-common.h			\
 	configuration.c configuration.h			\
 	cookies.c cookies.h				\
+	dateparse.c dateparse.h xgetdate.c		\
 	defs.c defs.h					\
 	eclient.c eclient.h				\
+	email.c						\
+	eventdist.c eventdist.h				\
 	event.c event.h 				\
 	eventlog.c eventlog.h 				\
 	filepart.c filepart.h				\
@@ -54,13 +56,14 @@ libdisorder_a_SOURCES=charset.c charset.h		\
 	kvp.c kvp.h					\
 	log.c log.h log-impl.h				\
 	logfd.c logfd.h					\
+	macros.c macros-builtin.c macros.h		\
 	mem.c mem.h mem-impl.h				\
 	mime.h mime.c					\
 	mixer.c mixer.h mixer-oss.c mixer-alsa.c	\
-	plugin.c plugin.h				\
 	printf.c printf.h				\
 	asprintf.c fprintf.c snprintf.c			\
 	queue.c queue.h					\
+	random.c random.h				\
 	regsub.c regsub.h				\
 	rights.c queue-rights.c rights.h		\
 	rtp.h						\
@@ -70,12 +73,15 @@ libdisorder_a_SOURCES=charset.c charset.h		\
 	sink.c sink.h					\
 	speaker-protocol.c speaker-protocol.h		\
 	split.c split.h					\
+	strptime.c strptime.h				\
 	syscalls.c syscalls.h				\
-	types.h						\
+	common.h					\
 	table.c table.h					\
 	timeval.h					\
 	$(TRACKDB) trackdb.h trackdb-int.h		\
-	trackname.c trackname.h				\
+	trackdb-playlists.c				\
+	trackname.c trackorder.c trackname.h		\
+	tracksort.c					\
 	url.h url.c					\
 	user.h user.c					\
 	unicode.h unicode.c				\
@@ -102,36 +108,25 @@ versionstring.h: version-string ${top_srcdir}/scripts/text2c
 
 definitions.h: Makefile
 	rm -f $@.new
-	echo "#define PKGLIBDIR \"${pkglibdir}\"" > $@.new
+	echo "/** @file lib/definitions.h" >> $@.new
+	echo " * @brief Definitions exported from makefile" >> $@.new
+	echo " *" >> $@.new
+	echo " * DO NOT EDIT." >> $@.new
+	echo " */" >> $@.new
+	echo "#define PKGLIBDIR \"${pkglibdir}\"" >> $@.new
 	echo "#define PKGCONFDIR \"${sysconfdir}/\"PACKAGE" >> $@.new
 	echo "#define PKGSTATEDIR \"${localstatedir}/\"PACKAGE" >> $@.new
 	echo "#define PKGDATADIR \"${pkgdatadir}/\"" >> $@.new
 	echo "#define SBINDIR \"${sbindir}/\"" >> $@.new
 	echo "#define BINDIR \"${bindir}/\"" >> $@.new
 	echo "#define FINKBINDIR \"${finkbindir}/\"" >> $@.new
+	echo "#define SENDMAIL \"${SENDMAIL}\"" >> $@.new
 	@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
 
-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
-
-check: test #test.i
-	./test
-
-check-report: before-check check make-coverage-reports
-before-check:
-	rm -f *.gcda *.gcov
-make-coverage-reports:
-	${GCOV} *.c | ${PYTHON} ../scripts/format-gcov-report --html . *.c
-
 rebuild-unicode:
 	cd ${srcdir} && ${top_srcdir}/scripts/make-unidata
 
@@ -139,6 +134,7 @@ rebuild-unicode:
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) -c $< > $@.new
 	mv $@.new $@
 
-CLEANFILES=definitions.h definitions.h.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