Play tracks from popup in new tracks list. The same code would work

[disorder] / disobedience / Makefile.am

diff --git a/disobedience/Makefile.am b/disobedience/Makefile.am
index bcab45a90026b5c22abfc31a97bd9ddac8e9367f..93d70962263de7e902c50fc50b919bf591016ce9 100644 (file)
--- a/disobedience/Makefile.am
+++ b/disobedience/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2006, 2007 Richard Kettlewell
+# Copyright (C) 2006-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
@@ -19,17 +19,18 @@
 #
 
 bin_PROGRAMS=disobedience
-doc_DATA=disobedience.html
+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 control.c properties.c menu.c \
-                 log.c progress.c login.c rtp.c help.c \
-                 ../lib/memgc.c settings.c
-disobedience_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBGCRYPT)
+       recent.c added.c queue-generic.c queue-generic.h queue-menu.c   \
+       choose.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
+disobedience_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBGCRYPT) \
+       $(LIBASOUND) $(COREAUDIO) $(LIBDB)
 disobedience_LDFLAGS=$(GTK_LIBS)
 
 install-exec-hook:
@@ -46,14 +47,15 @@ disobedience.html: ../doc/disobedience.1 $(top_srcdir)/scripts/htmlman
 misc.o: images.h
 
 images.h: $(PNGS)
+       set -e;                                                         \
        exec > @$.new;                                                  \
        for png in $(PNGS); do                                          \
-         name=`echo $$png | sed 's,.*/,,;s,\.png,,;'`;                 \
+         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 | sed 's,.*/,,;s,\.png,,;'`;                 \
+         name=`echo $$png | $(GNUSED) 's,.*/,,;s,\.png,,;'`;           \
          echo "  { \"$$name.png\", image_$$name },";                   \
        done;                                                           \
        echo "};"
@@ -61,4 +63,9 @@ images.h: $(PNGS)
 
 # 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
+
+export GNUSED