X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile.am;h=2507df318207d969a3b38e4f09cc040b189c6fae;hb=4a048abd925e066dc7c995a8cbecf5628813df81;hp=88482667c9446b8780d4e824e36b64abc24e059d;hpb=acfd2a2b80f968c4cddcac3c671a21603767b547;p=ncmpc.git

diff --git a/Makefile.am b/Makefile.am
index 8848266..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 \
@@ -104,6 +103,20 @@ src_ncmpc_SOURCES = \
 	src/strfsong.c \
 	src/utils.c
 
+#
+# Windows resource file
+#
+
+src/win/ncmpc_win32_rc.$(OBJEXT): src/win/ncmpc_win32_rc.rc
+	$(WINDRES) -i $< -o $@
+
+if HAVE_WINDOWS
+noinst_DATA = src/win/ncmpc_win32_rc.rc
+
+src_ncmpc_DEPENDENCIES = src/win/ncmpc_win32_rc.$(OBJEXT)
+src_ncmpc_LDFLAGS = -Wl,src/win/ncmpc_win32_rc.$(OBJEXT)
+endif
+
 if NCMPC_MINI
 else
 src_ncmpc_SOURCES += \
@@ -148,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
@@ -188,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
 
@@ -234,4 +251,5 @@ endif
 
 EXTRA_DIST = autogen.sh \
 	$(lyrics_plugins) \
-	$(man_MANS) $(doc_DATA) doc/doxygen.conf
+	$(man_MANS) $(doc_DATA) doc/doxygen.conf \
+	src/win/ncmpc_win32_rc.rc.in