command.c: put curly braces around a single large statement

[ncmpc.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 93fdf3162f6183b5b738ad3e382d74dd5deaf803..dce18a5473faf701c119a1fb61292c84e83eb9b3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,10 @@ SUBDIRS = \
   po
 
 ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = foreign 1.9 dist-bzip2
+AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2 subdir-objects
 
 AM_CPPFLAGS = \
+       $(CURSES_LIB) \
        $(LIBMPDCLIENT_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(LIBLIRCCLIENT_CFLAGS) \
@@ -12,6 +13,7 @@ AM_CPPFLAGS = \
        -DSYSCONFDIR=\""$(sysconfdir)"\"
 
 ncmpc_headers = \
+       src/glib_compat.h \
        src/resolver.h \
        src/gidle.h \
        src/mpdclient.h \
@@ -21,6 +23,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,7 +37,9 @@ 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 \
        src/charset.h \
        src/match.h \
@@ -45,7 +50,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 \
@@ -58,11 +63,13 @@ ncmpc_headers = \
        src/plugin.h \
        src/lyrics.h \
        src/str_pool.h \
-       src/lirc.h
+       src/lirc.h \
+       src/ncmpc_curses.h
 
 bin_PROGRAMS = src/ncmpc
 
 src_ncmpc_LDADD = \
+       $(CURSES_LIB) \
        $(LIBMPDCLIENT_LIBS) \
        $(GLIB_LIBS) \
        $(LIBLIRCCLIENT_LIBS)
@@ -88,10 +95,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 \
@@ -148,13 +156,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 = @CURSES_LIB@ $(GLIB_LIBS)
+
 #
 # sparse
 #
@@ -172,7 +191,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