X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile.am;h=a72ecab446fd7f4f21d7f9c08805a66e01744c05;hb=474623a0d69139a235bc797a559d0bddb25b0588;hp=ae6d5560f77d8ebdbde6c354c4fd476643efdadb;hpb=dd83d47626fdef308c92839aca2c79a1ed51fdc4;p=ncmpc.git diff --git a/Makefile.am b/Makefile.am index ae6d556..a72ecab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,109 +2,77 @@ SUBDIRS = \ po ACLOCAL_AMFLAGS = -I m4 -AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2 subdir-objects +AUTOMAKE_OPTIONS = foreign 1.11 dist-xz subdir-objects AM_CPPFLAGS = \ + $(CURSES_CFLAGS) \ $(LIBMPDCLIENT_CFLAGS) \ $(GLIB_CFLAGS) \ $(LIBLIRCCLIENT_CFLAGS) \ -DLOCALE_DIR=\""$(datadir)/locale"\"\ -DSYSCONFDIR=\""$(sysconfdir)"\" -ncmpc_headers = \ - src/glib_compat.h \ - src/resolver.h \ - src/gidle.h \ - src/mpdclient.h \ - src/playlist.h \ - src/filelist.h \ - src/options.h \ - src/conf.h \ - src/command.h \ - src/ncu.h \ - src/ncfix.h \ - src/player_command.h \ - src/window.h \ - src/title_bar.h \ - src/progress_bar.h \ - src/status_bar.h \ - src/screen.h \ - src/screen_status.h \ - src/screen_interface.h \ - src/screen_list.h \ - src/screen_find.h \ - src/screen_utils.h \ - src/screen_client.h \ - src/list_window.h \ - src/song_paint.h \ - src/colors.h \ - src/paint.h \ - src/hscroll.h \ - src/charset.h \ - src/match.h \ - src/wreadln.h \ - src/strfsong.h \ - src/utils.h \ - src/ncmpc.h \ - src/defaults.h \ - src/i18n.h \ - src/screen_help.h \ - src/screen_queue.h \ - src/screen_file.h \ - src/screen_artist.h \ - src/screen_browser.h \ - src/screen_search.h \ - src/screen_song.h \ - 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/lirc.h \ - src/ncmpc_curses.h - bin_PROGRAMS = src/ncmpc src_ncmpc_LDADD = \ - $(CURSES_LIB) \ + $(CURSES_LIBS) \ $(LIBMPDCLIENT_LIBS) \ $(GLIB_LIBS) \ $(LIBLIRCCLIENT_LIBS) src_ncmpc_SOURCES = \ - $(ncmpc_headers) \ - src/resolver.c \ + src/Compiler.h \ + src/ncmpc.h \ + src/defaults.h \ + src/ncmpc_curses.h \ + src/i18n.h \ src/main.c \ - src/gidle.c \ - src/mpdclient.c \ - src/playlist.c \ - src/filelist.c \ - src/options.c \ - src/command.c \ - src/ncu.c \ - src/player_command.c \ - src/title_bar.c \ - src/progress_bar.c \ - src/status_bar.c \ - src/screen.c \ - src/screen_status.c \ - src/screen_list.c \ - src/screen_find.c \ - src/screen_utils.c \ - src/screen_client.c \ - src/screen_queue.c \ - src/screen_browser.c \ - src/screen_file.c \ - src/list_window.c \ - src/song_paint.c \ - src/colors.c \ - src/charset.c \ - src/wreadln.c \ - src/strfsong.c \ - src/utils.c \ - src/win/ncmpc.rc + 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 \ + src/title_bar.c src/title_bar.h \ + src/progress_bar.c src/progress_bar.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_find.c src/screen_find.h \ + src/screen_client.c src/screen_client.h \ + src/screen_queue.c src/screen_queue.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/charset.c src/charset.h \ + src/window.h \ + src/wreadln.c src/wreadln.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 @@ -118,58 +86,63 @@ 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/hscroll.c \ - src/match.c \ - src/conf.c + 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 endif if ENABLE_HELP_SCREEN -src_ncmpc_SOURCES += src/screen_help.c +src_ncmpc_SOURCES += src/screen_help.c src/screen_help.h endif if ENABLE_ARTIST_SCREEN -src_ncmpc_SOURCES += src/screen_artist.c +src_ncmpc_SOURCES += src/screen_artist.c src/screen_artist.h endif if ENABLE_SEARCH_SCREEN -src_ncmpc_SOURCES += src/screen_search.c +src_ncmpc_SOURCES += src/screen_search.c src/screen_search.h endif if ENABLE_SONG_SCREEN -src_ncmpc_SOURCES += src/screen_song.c +src_ncmpc_SOURCES += src/screen_song.c src/screen_song.h endif if ENABLE_KEYDEF_SCREEN -src_ncmpc_SOURCES += src/screen_keydef.c +src_ncmpc_SOURCES += src/screen_keydef.c src/screen_keydef.h endif if ENABLE_PLUGIN_LIBRARY -src_ncmpc_SOURCES += src/plugin.c +src_ncmpc_SOURCES += src/plugin.c src/plugin.h endif if ENABLE_SCREEN_TEXT -src_ncmpc_SOURCES += src/screen_text.c +src_ncmpc_SOURCES += src/screen_text.c src/screen_text.h endif if ENABLE_LYRICS_SCREEN -src_ncmpc_SOURCES += src/screen_lyrics.c src/lyrics.c +src_ncmpc_SOURCES += \ + src/screen_lyrics.c src/screen_lyrics.h \ + src/lyrics.c src/lyrics.h endif if ENABLE_OUTPUTS_SCREEN -src_ncmpc_SOURCES += src/screen_outputs.c +src_ncmpc_SOURCES += src/screen_outputs.c src/screen_outputs.h endif if ENABLE_CHAT_SCREEN -src_ncmpc_SOURCES += src/screen_chat.c +src_ncmpc_SOURCES += src/screen_chat.c src/screen_chat.h endif if ENABLE_LIRC -src_ncmpc_SOURCES += src/lirc.c +src_ncmpc_SOURCES += src/lirc.c src/lirc.h endif @@ -189,7 +162,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 @@ -208,7 +181,7 @@ sparse-check: # lyrics plugins # -lyrics_plugins = lyrics/10-hd.sh lyrics/15-leoslyrics.sh lyrics/20-lyricwiki.rb lyrics/30-leoslyrics.py +lyrics_plugins = lyrics/10-hd.sh lyrics/20-lyricwiki.rb if ENABLE_LYRICS_SCREEN