X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile.am;h=8daa81459ccdec3556f9626427909297089e9c86;hb=8a2269fed3411353d9d65662c8c746ea9cfb7a50;hp=1033e66b3ab05a2fd7b27e1d93d01128dfb7bf21;hpb=8e9691d97f6e58b322629eb4551eb98aa1b3e07d;p=ncmpc.git

diff --git a/Makefile.am b/Makefile.am
index 1033e66..8daa814 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,6 +12,7 @@ AM_CPPFLAGS = \
 	-DSYSCONFDIR=\""$(sysconfdir)"\"
 
 ncmpc_headers = \
+	src/glib_compat.h \
 	src/resolver.h \
 	src/gidle.h \
 	src/mpdclient.h \
@@ -166,7 +167,7 @@ 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_CPPFLAGS = -I$(srcdir)/src $(AM_CPPFLAGS)
 test_run_hscroll_LDFLAGS = $(GLIB_LIBS)
 
 #
@@ -186,7 +187,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