Update copyright dates

[disorder] / disobedience / Makefile.am

diff --git a/disobedience/Makefile.am b/disobedience/Makefile.am
index 561f8bb7e6d2755db1da4c3eb0e636be2ced02d4..c7b702bc32ca5bb0a6948ba5932d997b9ee9d596 100644 (file)
--- a/disobedience/Makefile.am
+++ b/disobedience/Makefile.am
@@ -1,33 +1,36 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2006, 2007 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
 
 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 \
-                 log.c progress.c login.c rtp.c help.c \
-                 ../lib/memgc.c
-disobedience_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBGCRYPT)
+       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
+disobedience_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBGCRYPT) \
+       $(LIBASOUND) $(COREAUDIO) $(LIBDB) $(LIBICONV)
 disobedience_LDFLAGS=$(GTK_LIBS)
 
 install-exec-hook:
@@ -35,24 +38,35 @@ install-exec-hook:
 
 check: check-help
 
-disobedience.o: style.h
-
-style.h: ${srcdir}/disobedience.rc ${top_srcdir}/scripts/text2c
-       ${top_srcdir}/scripts/text2c style ${srcdir}/disobedience.rc > $@.tmp
-       mv $@.tmp $@
-
-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
 
-EXTRA_DIST=disobedience.rc
+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 $@
 
 # check everything has working --help
 check-help: all
-       ./disobedience --version > /dev/null
+       unset DISPLAY;./disobedience --version > /dev/null
+       unset DISPLAY;./disobedience --help > /dev/null
+
+CLEANFILES=disobedience.html images.h \
+          *.gcda *.gcov *.gcno *.c.html index.html
+
+export GNUSED