X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile.am;h=e93c941f95bb2fec1d7b9ce17fc5c1939569327a;hb=676828ad010959b186ec3094653b881369aebffa;hp=911b19ec1b515cdc436ebbfc54045d85a29c1cb8;hpb=b9e789d44a53aa5f44d33ee1cb8682716ca1d31a;p=ncmpc.git

diff --git a/Makefile.am b/Makefile.am
index 911b19e..e93c941 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,18 +2,19 @@ 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) \
 	$(GLIB_CFLAGS) \
 	$(LIBLIRCCLIENT_CFLAGS) \
 	-DLOCALE_DIR=\""$(datadir)/locale"\"\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"
 
 ncmpc_headers = \
-	src/libmpdclient.h \
+	src/glib_compat.h \
 	src/resolver.h \
-	src/song.h \
+	src/gidle.h \
 	src/mpdclient.h \
 	src/playlist.h \
 	src/filelist.h \
@@ -21,12 +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 \
@@ -36,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 \
@@ -46,28 +67,36 @@ ncmpc_headers = \
 bin_PROGRAMS = src/ncmpc
 
 src_ncmpc_LDADD = \
+	$(LIBMPDCLIENT_LIBS) \
 	$(GLIB_LIBS) \
 	$(LIBLIRCCLIENT_LIBS)
 
 src_ncmpc_SOURCES = \
 	$(ncmpc_headers) \
-	src/libmpdclient.c \
 	src/resolver.c \
-	src/song.c \
 	src/main.c \
+	src/gidle.c \
 	src/mpdclient.c \
 	src/playlist.c \
 	src/filelist.c \
 	src/options.c \
 	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_play.c \
+	src/screen_client.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 \
@@ -124,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
 #
@@ -148,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