X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/3a8b42d3b8549afa2da08757107f43c41d19ae0c..f6033c46c877646b95bc2e99ce69097203bc5c77:/lib/Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index d9135ca..dc6518d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,3 @@
-
 #
 # This file is part of DisOrder.
 # Copyright (C) 2004, 2005, 2006, s007 Richard Kettlewell
@@ -37,7 +36,10 @@ libdisorder_a_SOURCES=charset.c charset.h		\
 	eventlog.c eventlog.h 				\
 	filepart.c filepart.h				\
 	hash.c hash.h					\
+	heap.h						\
 	hex.c hex.h					\
+	html.c html.h					\
+	ifreq.c ifreq.h					\
 	inputline.c inputline.h				\
 	kvp.c kvp.h					\
 	log.c log.h log-impl.h				\
@@ -50,20 +52,24 @@ libdisorder_a_SOURCES=charset.c charset.h		\
 	asprintf.c fprintf.c snprintf.c			\
 	queue.c queue.h					\
 	regsub.c regsub.h				\
+	rtp.h						\
 	selection.c selection.h				\
 	signame.c signame.h				\
 	sink.c sink.h					\
-	speaker.c speaker.h				\
+	speaker-protocol.c speaker-protocol.h		\
 	split.c split.h					\
 	syscalls.c syscalls.h				\
 	types.h						\
 	table.c table.h					\
+	timeval.h					\
 	trackname.c trackname.h				\
 	user.h user.c					\
+	unidata.h unidata.c				\
 	utf8.h utf8.c					\
 	vacopy.h					\
 	vector.c vector.h				\
-	words.c words.h casefold.h unicodegc.h 		\
+	wav.h wav.c					\
+	words.c words.h 				\
 	wstat.c wstat.h					\
 	disorder.h
 
@@ -73,15 +79,24 @@ definitions.h: Makefile
 	echo "#define PKGCONFDIR \"${sysconfdir}/\"PACKAGE" >> $@.new
 	echo "#define PKGSTATEDIR \"${localstatedir}/\"PACKAGE" >> $@.new
 	echo "#define PKGDATADIR \"${pkgdatadir}/\"" >> $@.new
-	mv $@.new $@
+	echo "#define SBINDIR \"${sbindir}/\"" >> $@.new
+	echo "#define BINDIR \"${bindir}/\"" >> $@.new
+	echo "#define FINKBINDIR \"${finkbindir}/\"" >> $@.new
+	@if cmp $@.new $@; then \
+		echo rm -f $@.new; rm -f $@.new; else \
+		echo mv $@.new $@; mv $@.new $@; fi
 defs.o: definitions.h
 defs.lo: definitions.h
 
 test_SOURCES=test.c
-test_LDADD=libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBICONV)
+test_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV)
 test_DEPENDENCIES=libdisorder.a
 
-check: test
+check: test #test.i
 	./test
 
-CLEANFILES=definitions.h
+%.i: %.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) -c $< > $@.new
+	mv $@.new $@
+
+CLEANFILES=definitions.h definitions.h.new