X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/45aecd6da1839bc6cdcee992ade6e77f77ae7f51..4908c9d03361e2454ce407a9705c2ab9d7140b33:/disobedience/Makefile.am

diff --git a/disobedience/Makefile.am b/disobedience/Makefile.am
index 0255824..9b86bd7 100644
--- a/disobedience/Makefile.am
+++ b/disobedience/Makefile.am
@@ -1,25 +1,23 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2006-2008 Richard Kettlewell
+# Copyright (C) 2006-2009 Richard Kettlewell
 #
-# This program is free software; you can redistribute it and/or modify
+# 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 bin_PROGRAMS=disobedience
-pkgdata_DATA=disobedience.html
+SUBDIRS=manual
 
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 AM_CFLAGS=$(GLIB_CFLAGS) $(GTK_CFLAGS)
@@ -30,9 +28,10 @@ disobedience_SOURCES=disobedience.h disobedience.c client.c queue.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
+	popup.h playlists.c multidrag.c multidrag.h autoscroll.c
+	autoscroll.h
 disobedience_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBGCRYPT) \
-	$(LIBASOUND) $(COREAUDIO) $(LIBDB)
+	$(LIBASOUND) $(COREAUDIO) $(LIBDB) $(LIBICONV)
 disobedience_LDFLAGS=$(GTK_LIBS)
 
 install-exec-hook:
@@ -40,12 +39,6 @@ install-exec-hook:
 
 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)
@@ -68,6 +61,7 @@ check-help: all
 	unset DISPLAY;./disobedience --version > /dev/null
 	unset DISPLAY;./disobedience --help > /dev/null
 
-CLEANFILES=disobedience.html images.h
+CLEANFILES=images.h \
+	   *.gcda *.gcov *.gcno *.c.html index.html
 
 export GNUSED