diff --git a/Makefile.am b/Makefile.am
index 8ad132b2b2f8b1dbbbe2cb7613ca2f507674a506..e93c941f95bb2fec1d7b9ce17fc5c1939569327a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
po
ACLOCAL_AMFLAGS = -I m4
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) \
AM_CPPFLAGS = \
$(LIBMPDCLIENT_CFLAGS) \
-DSYSCONFDIR=\""$(sysconfdir)"\"
ncmpc_headers = \
-DSYSCONFDIR=\""$(sysconfdir)"\"
ncmpc_headers = \
+ src/glib_compat.h \
src/resolver.h \
src/gidle.h \
src/mpdclient.h \
src/resolver.h \
src/gidle.h \
src/mpdclient.h \
src/conf.h \
src/command.h \
src/ncu.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/player_command.h \
src/window.h \
src/title_bar.h \
src/screen_utils.h \
src/screen_client.h \
src/list_window.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/colors.h \
src/paint.h \
src/hscroll.h \
src/screen_browser.c \
src/screen_file.c \
src/list_window.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 \
src/colors.c \
src/charset.c \
src/wreadln.c \
endif
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
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
#
#
# sparse
#
# lyrics plugins
#
# 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
if ENABLE_LYRICS_SCREEN