Merge playlist branch against trunk to date.

[disorder] / disobedience / Makefile.am

diff --git a/disobedience/Makefile.am b/disobedience/Makefile.am
index b2da5ee686a3e3b3079f3234cbdc438b245fbb35..94a4c786e9b146d5a18d117dc200ec4a4bdf00f3 100644 (file)
--- a/disobedience/Makefile.am
+++ b/disobedience/Makefile.am
@@ -28,7 +28,7 @@ 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
 disobedience_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBGCRYPT) \
        $(LIBASOUND) $(COREAUDIO) $(LIBDB)
 disobedience_LDFLAGS=$(GTK_LIBS)
@@ -66,6 +66,7 @@ check-help: all
        unset DISPLAY;./disobedience --version > /dev/null
        unset DISPLAY;./disobedience --help > /dev/null
 
-CLEANFILES=disobedience.html images.h
+CLEANFILES=disobedience.html images.h \
+          *.gcda *.gcov *.gcno *.c.html index.html
 
 export GNUSED