X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/320598d40fb55001274c097d4a1a09c31b8d0335..159f3470a01211557dcd39f5701dcaf0f43f6683:/disobedience/Makefile.am

diff --git a/disobedience/Makefile.am b/disobedience/Makefile.am
index 11298d8..0b1433b 100644
--- a/disobedience/Makefile.am
+++ b/disobedience/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2006, 2007 Richard Kettlewell
+# Copyright (C) 2006-2008 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
@@ -19,14 +19,18 @@
 #
 
 bin_PROGRAMS=disobedience
+pkgdata_DATA=disobedience.html
 
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 AM_CFLAGS=$(GLIB_CFLAGS) $(GTK_CFLAGS)
+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 style.h control.c properties.c menu.c \
-	../lib/memgc.c
-disobedience_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBGCRYPT)
+		  choose.c misc.c control.c properties.c menu.c \
+		  log.c progress.c login.c rtp.c help.c \
+		  ../lib/memgc.c settings.c users.c
+disobedience_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBGCRYPT) \
+	$(LIBASOUND) $(COREAUDIO) $(LIBDB)
 disobedience_LDFLAGS=$(GTK_LIBS)
 
 install-exec-hook:
@@ -34,14 +38,31 @@ install-exec-hook:
 
 check: check-help
 
-disobedience.o: style.h
+disobedience.html: ../doc/disobedience.1 $(top_srcdir)/scripts/htmlman
+	rm -f $@.new
+	$(top_srcdir)/scripts/htmlman $< >$@.new
+	chmod 444 $@.new
+	mv -f $@.new $@
 
-style.h: ${srcdir}/disobedience.rc ${top_srcdir}/scripts/text2c
-	${top_srcdir}/scripts/text2c style ${srcdir}/disobedience.rc > style.h.tmp
-	mv style.h.tmp style.h
+misc.o: images.h
 
-EXTRA_DIST=disobedience.rc
+images.h: $(PNGS)
+	exec > @$.new;							\
+	for png in $(PNGS); do						\
+	  name=`echo $$png | $(GNUSED) 's,.*/,,;s,\.png,,;'`;			\
+	  gdk-pixbuf-csource --raw --name=image_$$name $$png;		\
+	done;								\
+	echo "static const struct image images[] = {";			\
+	for png in $(PNGS); do						\
+	  name=`echo $$png | $(GNUSED) 's,.*/,,;s,\.png,,;'`;			\
+	  echo "  { \"$$name.png\", image_$$name },";			\
+	done;								\
+	echo "};"
+	mv @$.new $@
 
 # check everything has working --help
 check-help: all
-	./disobedience --version > /dev/null
+	unset DISPLAY;./disobedience --version > /dev/null
+	unset DISPLAY;./disobedience --help > /dev/null
+
+export GNUSED