X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/e83d0967d4c0965eb8036248acc20d1bf12ad1d8..66ec39ed3af82963f63f16942149b9ba79aebe29:/lib/Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 212b1ce..e9f7e43 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -36,6 +36,7 @@ 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					\
 	inputline.c inputline.h				\
 	kvp.c kvp.h					\
@@ -53,7 +54,7 @@ libdisorder_a_SOURCES=charset.c charset.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						\
@@ -77,7 +78,9 @@ definitions.h: Makefile
 	echo "#define SBINDIR \"${sbindir}/\"" >> $@.new
 	echo "#define BINDIR \"${bindir}/\"" >> $@.new
 	echo "#define FINKBINDIR \"${finkbindir}/\"" >> $@.new
-	mv $@.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
 
@@ -85,7 +88,11 @@ test_SOURCES=test.c
 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