diff --git a/Makefile.am b/Makefile.am
index fc47485661ad2224378bcf5c3d9ca24957b2f548..124fb49ded0fc2a8eb464c8663c0bc9da262e385 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
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) \
-DSYSCONFDIR=\""$(sysconfdir)"\"
ncmpc_headers = \
+ src/glib_compat.h \
src/resolver.h \
+ src/gidle.h \
src/mpdclient.h \
src/playlist.h \
src/filelist.h \
src/conf.h \
src/command.h \
src/ncu.h \
+ src/ncfix.h \
src/player_command.h \
src/window.h \
src/title_bar.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 \
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 \
$(ncmpc_headers) \
src/resolver.c \
src/main.c \
+ src/gidle.c \
src/mpdclient.c \
src/playlist.c \
src/filelist.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 \
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
#
# 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