Synchronize with DisOrder 4.1

[disorder] / images / Makefile.am

diff --git a/images/Makefile.am b/images/Makefile.am
index 90f3a22a46bdac8b31f75951c8e927198ed3894b..88145b1a083a5a020b8bb055bc7f62aa62ae5654 100644 (file)
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2005, 2006 Richard Kettlewell
+# Copyright (C) 2005-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
@@ -18,13 +18,12 @@
 # USA
 #
 
-static_DATA=cross.png down.png downdown.png edit.png nocross.png       \
-nodown.png nodowndown.png noup.png noupup.png tick.png up.png upup.png  \
-notes.png play.png pause.png random.png randomcross.png notescross.png  \
-propagate.png
+pkghttp_DATA=cross.png down.png downdown.png edit.png nocross.png      \
+nodown.png nodowndown.png noup.png noupup.png tick.png up.png upup.png \
+notes.png play.png pause.png random.png randomcross.png notescross.png \
+propagate.png speaker.png speakercross.png directory.png logo.png      \
+logosmall.png
 
-staticdir=${pkgdatadir}/static
-
-EXTRA_DIST=$(static_DATA)
+EXTRA_DIST=$(pkghttp_DATA) duck.png disobedience16x16.xpm disobedience32x32.xpm
 
 CLEANFILES=$(SEDFILES)