diff --git a/Makefile.am b/Makefile.am
index f808ec63d396febd5d2dda357022171ece06476d..a72ecab446fd7f4f21d7f9c08805a66e01744c05 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
AUTOMAKE_OPTIONS = foreign 1.11 dist-xz subdir-objects
AM_CPPFLAGS = \
AUTOMAKE_OPTIONS = foreign 1.11 dist-xz subdir-objects
AM_CPPFLAGS = \
+ $(CURSES_CFLAGS) \
$(LIBMPDCLIENT_CFLAGS) \
$(GLIB_CFLAGS) \
$(LIBLIRCCLIENT_CFLAGS) \
$(LIBMPDCLIENT_CFLAGS) \
$(GLIB_CFLAGS) \
$(LIBLIRCCLIENT_CFLAGS) \
bin_PROGRAMS = src/ncmpc
src_ncmpc_LDADD = \
bin_PROGRAMS = src/ncmpc
src_ncmpc_LDADD = \
- $(CURSES_LIB) \
+ $(CURSES_LIBS) \
$(LIBMPDCLIENT_LIBS) \
$(GLIB_LIBS) \
$(LIBLIRCCLIENT_LIBS)
$(LIBMPDCLIENT_LIBS) \
$(GLIB_LIBS) \
$(LIBLIRCCLIENT_LIBS)
src/main.c \
src/gidle.c src/gidle.h \
src/mpdclient.c src/mpdclient.h \
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/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 \
src/ncfix.h \
src/ncu.c src/ncu.h \
src/player_command.c src/player_command.h \
src/status_bar.c src/status_bar.h \
src/screen.c src/screen.h \
src/screen_interface.h \
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 \
src/screen_utils.c src/screen_utils.h \
src/screen_status.c src/screen_status.h \
src/screen_list.c src/screen_list.h \
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/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 \
src/paint.h \
src/song_paint.c src/song_paint.h \
src/colors.c src/colors.h \
src/strfsong.c src/strfsong.h \
src/utils.c src/utils.h
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
#
#
# Windows resource file
#
src_ncmpc_DEPENDENCIES = src/win/ncmpc_win32_rc.$(OBJEXT)
src_ncmpc_LDFLAGS = -Wl,src/win/ncmpc_win32_rc.$(OBJEXT)
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 += \
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
src/hscroll.c src/hscroll.h \
src/match.c src/match.h \
src/conf.c src/conf.h
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_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
#
# sparse