screen_queue: fix CMD_SCREEN_SWAP with an empty queue

[ncmpc.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d0b55fcc852a53839be441950302eb1979302de1..ae6d5560f77d8ebdbde6c354c4fd476643efdadb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,6 @@ ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2 subdir-objects
 
 AM_CPPFLAGS = \
-       $(CURSES_LIB) \
        $(LIBMPDCLIENT_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(LIBLIRCCLIENT_CFLAGS) \
@@ -30,7 +29,7 @@ ncmpc_headers = \
        src/progress_bar.h \
        src/status_bar.h \
        src/screen.h \
-       src/screen_message.h \
+       src/screen_status.h \
        src/screen_interface.h \
        src/screen_list.h \
        src/screen_find.h \
@@ -59,10 +58,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
 
@@ -90,7 +89,7 @@ src_ncmpc_SOURCES = \
        src/progress_bar.c \
        src/status_bar.c \
        src/screen.c \
-       src/screen_message.c \
+       src/screen_status.c \
        src/screen_list.c \
        src/screen_find.c \
        src/screen_utils.c \
@@ -105,7 +104,21 @@ src_ncmpc_SOURCES = \
        src/wreadln.c \
        src/strfsong.c \
        src/utils.c \
-       src/str_pool.c
+       src/win/ncmpc.rc
+
+#
+# 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 +164,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
@@ -172,7 +189,7 @@ check_PROGRAMS = \
 
 test_run_hscroll_SOURCES = test/run_hscroll.c src/hscroll.c src/charset.c
 test_run_hscroll_CPPFLAGS = -I$(srcdir)/src $(AM_CPPFLAGS)
-test_run_hscroll_LDADD = $(GLIB_LIBS)
+test_run_hscroll_LDADD = @CURSES_LIB@ $(GLIB_LIBS)
 
 #
 # sparse
@@ -209,10 +226,33 @@ doc_DATA = \
        AUTHORS NEWS README
 man_MANS = doc/ncmpc.1
 
+if ENABLE_DOCUMENTATION
+doc/api/html/index.html: doc/doxygen.conf
+       @mkdir -p $(@D)
+       $(DOXYGEN) $<
+
+all-local: doc/api/html/index.html
+
+clean-local:
+       rm -rf doc/api
+
+# copied from MPD, disabled  --jn
+#---------------------------------------
+#install-data-local: doc/api/html/index.html
+#      $(mkinstalldirs) $(DESTDIR)$(docdir)/api/html
+#      $(INSTALL_DATA) -c -m 644 doc/api/html/*.* \
+#              $(DESTDIR)$(docdir)/api/html
+#
+#uninstall-local:
+#      rm -f $(DESTDIR)$(docdir)/api/html/*.*
+#---------------------------------------
+endif
+
 #
 # Distribution
 #
 
 EXTRA_DIST = autogen.sh \
        $(lyrics_plugins) \
-       $(man_MANS) $(doc_DATA)
+       $(man_MANS) $(doc_DATA) doc/doxygen.conf \
+       src/win/ncmpc_win32_rc.rc.in