X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile.am;h=1f8e8fea231dd98a302acbd7c34891c395de09d1;hb=b3f890e48e42fb39d46f9f085aa33b937c172ed0;hp=a6ca4f2e140404ff821406e5cf41640d38aea783;hpb=8ba6b8463c9b53bcd6b05574d639eb9ac099a37a;p=ncmpc.git

diff --git a/Makefile.am b/Makefile.am
index a6ca4f2..1f8e8fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,10 +2,9 @@ SUBDIRS = \
   po
 
 ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2 subdir-objects
+AUTOMAKE_OPTIONS = foreign 1.11 dist-bzip2 dist-xz subdir-objects
 
 AM_CPPFLAGS = \
-	$(CURSES_LIB) \
 	$(LIBMPDCLIENT_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(LIBLIRCCLIENT_CFLAGS) \
@@ -13,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 \
@@ -59,10 +56,10 @@ 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 \
-	src/str_pool.h \
 	src/lirc.h \
 	src/ncmpc_curses.h
 
@@ -76,7 +73,6 @@ src_ncmpc_LDADD = \
 
 src_ncmpc_SOURCES = \
 	$(ncmpc_headers) \
-	src/resolver.c \
 	src/main.c \
 	src/gidle.c \
 	src/mpdclient.c \
@@ -104,8 +100,21 @@ src_ncmpc_SOURCES = \
 	src/charset.c \
 	src/wreadln.c \
 	src/strfsong.c \
-	src/utils.c \
-	src/str_pool.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
@@ -151,6 +160,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
@@ -237,4 +250,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