From 444be90901ad09e78d0ff2a92872f43a510f5425 Mon Sep 17 00:00:00 2001 Message-Id: <444be90901ad09e78d0ff2a92872f43a510f5425.1715642953.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sun, 17 Jan 2010 17:37:44 +0000 Subject: [PATCH] Move images.h to images/ directory, and limit to just the images that Disobedience actually needs. Organization: Straylight/Edgeware From: Richard Kettlewell --- .bzrignore | 2 +- configure.ac | 3 ++- disobedience/Makefile.am | 23 +++-------------------- disobedience/misc.c | 4 ++-- images/Makefile.am | 26 ++++++++++++++++++++++++-- 5 files changed, 32 insertions(+), 26 deletions(-) diff --git a/.bzrignore b/.bzrignore index 4551219..30d6e0d 100644 --- a/.bzrignore +++ b/.bzrignore @@ -107,7 +107,7 @@ doc/disorder-normalize.8.html doc/disorder-decode.8.html doc/disorder-decode.8 doc/plumbing.png -disobedience/images.h +images/images.h debian/disorder-server doc/disorder-stats.8 doc/disorder-stats.8.html diff --git a/configure.ac b/configure.ac index 80e8e24..c72e59d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. # # This file is part of DisOrder. -# Copyright (C) 2004-2009 Richard Kettlewell +# Copyright (C) 2004-2010 Richard Kettlewell # Portions copyright (C) 2007 Ross Younger # # This program is free software: you can redistribute it and/or modify @@ -685,6 +685,7 @@ AM_CONDITIONAL([SERVER], [test x$want_server = xyes]) if test $want_gtk = yes; then AC_DEFINE([WITH_GTK], [1], [define if using GTK+]) fi +AM_CONDITIONAL([GTK], [test x$want_gtk = xyes]) if test "x$GCC" = xyes; then # We need LLONG_MAX and annoyingly GCC doesn't always give it to us diff --git a/disobedience/Makefile.am b/disobedience/Makefile.am index 4a49500..7b823c2 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 @@ -21,7 +21,6 @@ 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 \ @@ -39,29 +38,13 @@ install-exec-hook: check: check-help -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=images.h \ - *.gcda *.gcov *.gcno *.c.html index.html +CLEANFILES=*.gcda *.gcov *.gcno *.c.html index.html export GNUSED diff --git a/disobedience/misc.c b/disobedience/misc.c index 41fcd13..a1fdf4d 100644 --- a/disobedience/misc.c +++ b/disobedience/misc.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2006-2008 Richard Kettlewell + * Copyright (C) 2006-2008, 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 @@ -27,7 +27,7 @@ struct image { const guint8 *data; }; -#include "images.h" +#include "../images/images.h" /* Miscellaneous GTK+ stuff ------------------------------------------------ */ diff --git a/images/Makefile.am b/images/Makefile.am index 22322ed..36a6ad5 100644 --- a/images/Makefile.am +++ b/images/Makefile.am @@ -1,6 +1,6 @@ # # This file is part of DisOrder. -# Copyright (C) 2005-2009 Richard Kettlewell +# Copyright (C) 2005-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 @@ -30,4 +30,26 @@ randomdisabled32.png randomenabled32.png rtpdisabled32.png \ rtpenabled32.png duck55.png cards24.png cards48.png \ cards-simple-fanned.svg cards-thin.svg -CLEANFILES=$(SEDFILES) +DISOBEDIENCE_IMAGES=up.png down.png cards24.png logo256.png duck.png \ +propagate.png + +if GTK +noinst_HEADERS=images.h + +images.h: $(DISOBEDIENCE_IMAGES) + set -e; \ + exec > @$.new; \ + for png in $^; 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 `echo $^`; do \ + name=`echo $$png | $(GNUSED) 's,.*/,,;s,\.png,,;'`; \ + echo " { \"$$name.png\", image_$$name },"; \ + done|sort; \ + echo "};" + mv @$.new $@ +endif + +CLEANFILES=$(SEDFILES) images.h -- [mdw]