X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/c9467b7a34160c4e25580a2dc82087c5ae0bb2d0..02d50cbd5926b4ef1f88c6f9ca28486fa45508c0:/disobedience/Makefile.am

diff --git a/disobedience/Makefile.am b/disobedience/Makefile.am
index f8bdb14..bf5ea40 100644
--- a/disobedience/Makefile.am
+++ b/disobedience/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2006-2009 Richard Kettlewell
+# Copyright (C) 2006-2010 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
@@ -17,56 +17,31 @@
 #
 
 bin_PROGRAMS=disobedience
-pkgdata_DATA=disobedience.html
+SUBDIRS=manual
 
 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	\
 	recent.c added.c queue-generic.c queue-generic.h queue-menu.c	\
 	choose.c choose-menu.c choose-search.c popup.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 lookup.c choose.h      \
-	popup.h playlists.c
+	popup.h playlists.c multidrag.c multidrag.h autoscroll.c	\
+	autoscroll.h globals.c
 disobedience_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBGCRYPT) \
 	$(LIBASOUND) $(COREAUDIO) $(LIBDB) $(LIBICONV)
 disobedience_LDFLAGS=$(GTK_LIBS)
 
-install-exec-hook:
-	$(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
-
 check: check-help
 
-disobedience.html: ../doc/disobedience.1 $(top_srcdir)/scripts/htmlman
-	rm -f $@.new
-	$(top_srcdir)/scripts/htmlman $< >$@.new
-	chmod 444 $@.new
-	mv -f $@.new $@
-
-misc.o: images.h
-
-images.h: $(PNGS)
-	set -e;								\
-	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 $@
+misc.o: ../images/images.h
 
 # check everything has working --help
 check-help: all
 	unset DISPLAY;./disobedience --version > /dev/null
 	unset DISPLAY;./disobedience --help > /dev/null
 
-CLEANFILES=disobedience.html images.h \
-	   *.gcda *.gcov *.gcno *.c.html index.html
+CLEANFILES=*.gcda *.gcov *.gcno *.c.html index.html
 
 export GNUSED