X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile.am;h=8daa81459ccdec3556f9626427909297089e9c86;hb=ca5c918853f5bb8eda0ae89d45e41671ea4ac512;hp=52b5953f34897ed1fa8b25f8e6a32e104d789217;hpb=4052c59420cf7884579d320969140c00bffb4a5d;p=ncmpc.git

diff --git a/Makefile.am b/Makefile.am
index 52b5953..8daa814 100644
--- 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) \
@@ -12,7 +12,9 @@ AM_CPPFLAGS = \
 	-DSYSCONFDIR=\""$(sysconfdir)"\"
 
 ncmpc_headers = \
+	src/glib_compat.h \
 	src/resolver.h \
+	src/gidle.h \
 	src/mpdclient.h \
 	src/playlist.h \
 	src/filelist.h \
@@ -29,10 +31,13 @@ ncmpc_headers = \
 	src/screen_message.h \
 	src/screen_interface.h \
 	src/screen_list.h \
+	src/screen_find.h \
 	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 \
@@ -43,7 +48,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 \
@@ -69,6 +74,7 @@ src_ncmpc_SOURCES = \
 	$(ncmpc_headers) \
 	src/resolver.c \
 	src/main.c \
+	src/gidle.c \
 	src/mpdclient.c \
 	src/playlist.c \
 	src/filelist.c \
@@ -82,12 +88,14 @@ src_ncmpc_SOURCES = \
 	src/screen.c \
 	src/screen_message.c \
 	src/screen_list.c \
+	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 \
@@ -151,6 +159,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 = -I$(srcdir)/src $(AM_CPPFLAGS)
+test_run_hscroll_LDFLAGS = $(GLIB_LIBS)
+
 #
 # sparse
 #
@@ -168,7 +187,7 @@ sparse-check:
 # lyrics plugins
 #
 
-lyrics_plugins = lyrics/01-hd.sh lyrics/02-lyricwiki.rb lyrics/03-leoslyrics.py
+lyrics_plugins = lyrics/10-hd.sh lyrics/15-leoslyrics.sh lyrics/20-lyricwiki.rb lyrics/30-leoslyrics.py
 
 if ENABLE_LYRICS_SCREEN