player_command: break from switch if not playing

[ncmpc.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 93fdf3162f6183b5b738ad3e382d74dd5deaf803..531954593cc6c94c058c636e20976b391d9c5ab0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = \
   po
 
 ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = foreign 1.9 dist-bzip2
+AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2 subdir-objects
 
 AM_CPPFLAGS = \
        $(LIBMPDCLIENT_CFLAGS) \
@@ -34,7 +34,9 @@ ncmpc_headers = \
        src/screen_utils.h \
        src/screen_client.h \
        src/list_window.h \
+       src/song_paint.h \
        src/colors.h \
+       src/paint.h \
        src/hscroll.h \
        src/charset.h \
        src/match.h \
@@ -45,7 +47,7 @@ ncmpc_headers = \
        src/defaults.h \
        src/i18n.h \
        src/screen_help.h \
-       src/screen_play.h \
+       src/screen_queue.h \
        src/screen_file.h \
        src/screen_artist.h \
        src/screen_browser.h \
@@ -88,10 +90,11 @@ src_ncmpc_SOURCES = \
        src/screen_find.c \
        src/screen_utils.c \
        src/screen_client.c \
-       src/screen_play.c \
+       src/screen_queue.c \
        src/screen_browser.c \
        src/screen_file.c \
        src/list_window.c \
+       src/song_paint.c \
        src/colors.c \
        src/charset.c \
        src/wreadln.c \
@@ -155,6 +158,17 @@ src/ncmpc-tiny: $(filter-out %.h,$(src_ncmpc_SOURCES))
 
 CLEANFILES = src/ncmpc-tiny
 
+#
+# test suite
+#
+
+check_PROGRAMS = \
+       test/run_hscroll
+
+test_run_hscroll_SOURCES = test/run_hscroll.c src/hscroll.c src/charset.c
+test_run_hscroll_CPPFLAGS = -Isrc $(AM_CPPFLAGS)
+test_run_hscroll_LDFLAGS = $(GLIB_LIBS)
+
 #
 # sparse
 #