X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile.am;h=124fb49ded0fc2a8eb464c8663c0bc9da262e385;hb=6086140a91cf89a3b3f3edc01620f82ce4ee5423;hp=e90fb2ef7b3e16ecec774defeefb25e2b4dc80f8;hpb=8f159b41b1db6dfcebcd4cfe735e0bcdb2d5da40;p=ncmpc.git

diff --git a/Makefile.am b/Makefile.am
index e90fb2e..124fb49 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 \
@@ -20,15 +22,23 @@ 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 \
+	src/progress_bar.h \
+	src/status_bar.h \
 	src/screen.h \
+	src/screen_message.h \
+	src/screen_interface.h \
 	src/screen_list.h \
-	src/screen_play.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 \
@@ -38,7 +48,16 @@ ncmpc_headers = \
 	src/ncmpc.h \
 	src/defaults.h \
 	src/i18n.h \
+	src/screen_help.h \
+	src/screen_queue.h \
+	src/screen_file.h \
+	src/screen_artist.h \
 	src/screen_browser.h \
+	src/screen_search.h \
+	src/screen_song.h \
+	src/screen_keydef.h \
+	src/screen_lyrics.h \
+	src/screen_outputs.h \
 	src/screen_text.h \
 	src/plugin.h \
 	src/lyrics.h \
@@ -56,6 +75,7 @@ src_ncmpc_SOURCES = \
 	$(ncmpc_headers) \
 	src/resolver.c \
 	src/main.c \
+	src/gidle.c \
 	src/mpdclient.c \
 	src/playlist.c \
 	src/filelist.c \
@@ -63,14 +83,20 @@ src_ncmpc_SOURCES = \
 	src/command.c \
 	src/ncu.c \
 	src/player_command.c \
+	src/title_bar.c \
+	src/progress_bar.c \
+	src/status_bar.c \
 	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 \
@@ -134,6 +160,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_LDADD = $(GLIB_LIBS)
+
 #
 # sparse
 #
@@ -151,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