X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/d4ef413201b6aa149d11992dc2527e07cd9085d4..0581deeae30cae3eacf6b3a30b980c84f21b083f:/disobedience/Makefile.am

diff --git a/disobedience/Makefile.am b/disobedience/Makefile.am
index eb257d6..93a280a 100644
--- a/disobedience/Makefile.am
+++ b/disobedience/Makefile.am
@@ -19,16 +19,18 @@
 #
 
 bin_PROGRAMS=disobedience
+doc_DATA=disobedience.html
 
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 AM_CFLAGS=$(GLIB_CFLAGS) $(GTK_CFLAGS)
-PNGS:=$(wildcard ${top_srcdir}/images/*.png)
+PNGS:=$(shell export LC_COLLATE=C;echo ${top_srcdir}/images/*.png)
 
 disobedience_SOURCES=disobedience.h disobedience.c client.c queue.c	\
 		  choose.c misc.c control.c properties.c menu.c \
 		  log.c progress.c login.c rtp.c help.c \
-		  ../lib/memgc.c appearance.c
-disobedience_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBGCRYPT)
+		  ../lib/memgc.c settings.c
+disobedience_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBGCRYPT) \
+	$(LIBASOUND) $(COREAUDIO)
 disobedience_LDFLAGS=$(GTK_LIBS)
 
 install-exec-hook:
@@ -36,18 +38,12 @@ install-exec-hook:
 
 check: check-help
 
-help.o: manual.h
-
-manual.html: ../doc/disobedience.1 $(top_srcdir)/scripts/htmlman
+disobedience.html: ../doc/disobedience.1 $(top_srcdir)/scripts/htmlman
 	rm -f $@.new
 	$(top_srcdir)/scripts/htmlman $< >$@.new
 	chmod 444 $@.new
 	mv -f $@.new $@
 
-manual.h: manual.html ${top_srcdir}/scripts/text2c
-	${top_srcdir}/scripts/text2c manual manual.html > $@.tmp
-	mv $@.tmp $@
-
 misc.o: images.h
 
 images.h: $(PNGS)