main: move default_settings_name() to mpdclient.c

[ncmpc.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cf10d00ce431b3b9722bc8b0c90b4a77bbdd21bf..ac11c693a64b83eb5ed2b3d36ea1d34afd88f95e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,7 @@ ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = foreign 1.11 dist-xz subdir-objects
 
 AM_CPPFLAGS = \
+       $(CURSES_CFLAGS) \
        $(LIBMPDCLIENT_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(LIBLIRCCLIENT_CFLAGS) \
@@ -14,7 +15,7 @@ AM_CPPFLAGS = \
 bin_PROGRAMS = src/ncmpc
 
 src_ncmpc_LDADD = \
-       $(CURSES_LIB) \
+       $(CURSES_LIBS) \
        $(LIBMPDCLIENT_LIBS) \
        $(GLIB_LIBS) \
        $(LIBLIRCCLIENT_LIBS)
@@ -33,6 +34,7 @@ src_ncmpc_SOURCES = \
        src/filelist.c src/filelist.h \
        src/options.c src/options.h \
        src/command.c src/command.h \
+       src/keyboard.c src/keyboard.h \
        src/ncfix.h \
        src/ncu.c src/ncu.h \
        src/player_command.c src/player_command.h \
@@ -41,6 +43,8 @@ src_ncmpc_SOURCES = \
        src/status_bar.c src/status_bar.h \
        src/screen.c src/screen.h \
        src/screen_interface.h \
+       src/screen_init.c \
+       src/screen_paint.c \
        src/screen_utils.c src/screen_utils.h \
        src/screen_status.c src/screen_status.h \
        src/screen_list.c src/screen_list.h \
@@ -50,6 +54,7 @@ src_ncmpc_SOURCES = \
        src/screen_browser.c src/screen_browser.h \
        src/screen_file.c src/screen_file.h \
        src/list_window.c src/list_window.h \
+       src/save_playlist.c src/save_playlist.h \
        src/paint.h \
        src/song_paint.c src/song_paint.h \
        src/colors.c src/colors.h \
@@ -57,8 +62,19 @@ src_ncmpc_SOURCES = \
        src/window.h \
        src/wreadln.c src/wreadln.h \
        src/strfsong.c src/strfsong.h \
+       src/time_format.c src/time_format.h \
        src/utils.c src/utils.h
 
+if ENABLE_ASYNC_CONNECT
+src_ncmpc_SOURCES += \
+       src/net/types.h \
+       src/net/socket.c src/net/socket.h \
+       src/net/resolver.c src/net/resolver.h \
+       src/net/async_connect.c src/net/async_connect.h \
+       src/net/async_rconnect.c src/net/async_rconnect.h \
+       src/aconnect.c src/aconnect.h
+endif
+
 #
 # Windows resource file
 #
@@ -71,11 +87,15 @@ 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)
+else
+src_ncmpc_SOURCES += src/signals.c src/signals.h
 endif
 
 if NCMPC_MINI
 else
 src_ncmpc_SOURCES += \
+       src/db_completion.c src/db_completion.h \
+       src/xterm_title.c src/xterm_title.h \
        src/hscroll.c src/hscroll.h \
        src/match.c src/match.h \
        src/conf.c src/conf.h
@@ -144,7 +164,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 = @CURSES_LIB@ $(GLIB_LIBS)
+test_run_hscroll_LDADD = $(CURSES_LIBS) $(GLIB_LIBS)
 
 #
 # sparse