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

[ncmpc.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 531954593cc6c94c058c636e20976b391d9c5ab0..dce18a5473faf701c119a1fb61292c84e83eb9b3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,7 @@ ACLOCAL_AMFLAGS = -I m4
 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 \
@@ -60,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)
@@ -151,7 +156,7 @@ 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 $@
@@ -166,8 +171,8 @@ check_PROGRAMS = \
        test/run_hscroll
 
 test_run_hscroll_SOURCES = test/run_hscroll.c src/hscroll.c src/charset.c
-test_run_hscroll_CPPFLAGS = -Isrc $(AM_CPPFLAGS)
-test_run_hscroll_LDFLAGS = $(GLIB_LIBS)
+test_run_hscroll_CPPFLAGS = -I$(srcdir)/src $(AM_CPPFLAGS)
+test_run_hscroll_LDADD = @CURSES_LIB@ $(GLIB_LIBS)
 
 #
 # sparse
@@ -186,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