X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile.am;h=2507df318207d969a3b38e4f09cc040b189c6fae;hb=b6fab39214185c971145a4eabd1aab12fa9748ba;hp=17cdb9f72b3c0f9ee52ad82c4a0ddf5495232489;hpb=cf6fec9daebebb24b4ae21cca93e21b916b88d0c;p=ncmpc.git

diff --git a/Makefile.am b/Makefile.am
index 17cdb9f..2507df3 100644
--- 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 \
@@ -58,6 +56,7 @@ ncmpc_headers = \
 	src/screen_keydef.h \
 	src/screen_lyrics.h \
 	src/screen_outputs.h \
+	src/screen_chat.h \
 	src/screen_text.h \
 	src/plugin.h \
 	src/lyrics.h \
@@ -73,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 \
@@ -102,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
@@ -163,6 +161,10 @@ if ENABLE_OUTPUTS_SCREEN
 src_ncmpc_SOURCES += src/screen_outputs.c
 endif
 
+if ENABLE_CHAT_SCREEN
+src_ncmpc_SOURCES += src/screen_chat.c
+endif
+
 if ENABLE_LIRC
 src_ncmpc_SOURCES += src/lirc.c
 endif
@@ -203,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