X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile.am;h=53293154c48225ce9e401a2bdbe9c64c7d7d8249;hb=758546d96b07de76947bfdef71ea83d2500b51d7;hp=f808ec63d396febd5d2dda357022171ece06476d;hpb=1018063f48c1d8bafa47c4c04fd5c6f7f1f47f83;p=ncmpc.git

diff --git a/Makefile.am b/Makefile.am
index f808ec6..5329315 100644
--- 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)
@@ -28,10 +29,12 @@ src_ncmpc_SOURCES = \
 	src/main.c \
 	src/gidle.c src/gidle.h \
 	src/mpdclient.c src/mpdclient.h \
+	src/callbacks.c src/callbacks.h \
 	src/playlist.c src/playlist.h \
 	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 \
@@ -58,6 +61,16 @@ src_ncmpc_SOURCES = \
 	src/strfsong.c src/strfsong.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
 #
@@ -70,11 +83,14 @@ 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/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
@@ -143,7 +159,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