strfsong: implement "%disc%"

[ncmpc.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ae6d5560f77d8ebdbde6c354c4fd476643efdadb..2507df318207d969a3b38e4f09cc040b189c6fae 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = \
   po
 
 ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2 subdir-objects
+AUTOMAKE_OPTIONS = foreign 1.11 dist-xz subdir-objects
 
 AM_CPPFLAGS = \
        $(LIBMPDCLIENT_CFLAGS) \
@@ -12,8 +12,6 @@ AM_CPPFLAGS = \
        -DSYSCONFDIR=\""$(sysconfdir)"\"
 
 ncmpc_headers = \
-       src/glib_compat.h \
-       src/resolver.h \
        src/gidle.h \
        src/mpdclient.h \
        src/playlist.h \
@@ -74,8 +72,8 @@ src_ncmpc_LDADD = \
        $(LIBLIRCCLIENT_LIBS)
 
 src_ncmpc_SOURCES = \
+       src/Compiler.h \
        $(ncmpc_headers) \
-       src/resolver.c \
        src/main.c \
        src/gidle.c \
        src/mpdclient.c \
@@ -103,8 +101,7 @@ src_ncmpc_SOURCES = \
        src/charset.c \
        src/wreadln.c \
        src/strfsong.c \
-       src/utils.c \
-       src/win/ncmpc.rc
+       src/utils.c
 
 #
 # Windows resource file
@@ -208,7 +205,7 @@ sparse-check:
 # lyrics plugins
 #
 
-lyrics_plugins = lyrics/10-hd.sh lyrics/15-leoslyrics.sh lyrics/20-lyricwiki.rb lyrics/30-leoslyrics.py
+lyrics_plugins = lyrics/10-hd.sh lyrics/20-lyricwiki.rb
 
 if ENABLE_LYRICS_SCREEN