X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile.am;h=e93c941f95bb2fec1d7b9ce17fc5c1939569327a;hb=293c575568252438d91f7e758285ff75bd08119f;hp=ca5264fab2767b2a68bdb8ca5564b5cc6f08c74d;hpb=271507f1f1b9a84a68e81a66a0c9440112a0ed20;p=ncmpc.git

diff --git a/Makefile.am b/Makefile.am
index ca5264f..e93c941 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,6 +12,7 @@ AM_CPPFLAGS = \
 	-DSYSCONFDIR=\""$(sysconfdir)"\"
 
 ncmpc_headers = \
+	src/glib_compat.h \
 	src/resolver.h \
 	src/gidle.h \
 	src/mpdclient.h \
@@ -21,6 +22,7 @@ ncmpc_headers = \
 	src/conf.h \
 	src/command.h \
 	src/ncu.h \
+	src/ncfix.h \
 	src/player_command.h \
 	src/window.h \
 	src/title_bar.h \
@@ -34,6 +36,7 @@ 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 \
@@ -46,7 +49,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 \
@@ -89,10 +92,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 \
@@ -149,13 +153,24 @@ src_ncmpc_SOURCES += src/lirc.c
 endif
 
 
-# build the smalles possible ncmpc binary
+# build the smallest possible ncmpc binary
 src/ncmpc-tiny: $(filter-out %.h,$(src_ncmpc_SOURCES))
 	$(COMPILE) --combine -fwhole-program $(src_ncmpc_LDFLAGS) $(src_ncmpc_LDADD) $(LIBS) $^ -o $@
 	strip --strip-all $@
 
 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_LDADD = $(GLIB_LIBS)
+
 #
 # sparse
 #
@@ -173,7 +188,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