vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Sep 22 18:26:48 2013 +0300| [bd17d39540b71a88d18564e3be35158e4b600ee0] | committer: Rémi Denis-Courmont
misc: avoid genmf in some simple cases Also do not hard-code -lm for the fingerprinter. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bd17d39540b71a88d18564e3be35158e4b600ee0 --- configure.ac | 5 ++--- modules/misc/Modules.am | 17 ++++++++++------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 182d5c6..7c5fd38 100644 --- a/configure.ac +++ b/configure.ac @@ -602,7 +602,7 @@ AC_CHECK_FUNCS([if_nameindex if_nametoindex]) VLC_RESTORE_FLAGS AS_IF([test -n "$SOCKET_LIBS"], [ - VLC_ADD_LIBS([access_rtmp access_output_shout sap stream_out_standard stream_out_rtp stream_out_raop vod_rtsp rtp oldrc netsync gnutls ts audioscrobbler remoteosd audiobargraph_a],[${SOCKET_LIBS}]) + VLC_ADD_LIBS([access_rtmp access_output_shout sap stream_out_standard stream_out_rtp stream_out_raop vod_rtsp rtp oldrc netsync gnutls ts remoteosd audiobargraph_a],[${SOCKET_LIBS}]) ]) AC_SUBST(SOCKET_LIBS) @@ -3656,10 +3656,9 @@ dnl chromaprint audio track fingerprinter dnl m4_pushdef([libchromaprint_version], 0.6.0) PKG_WITH_MODULES([CHROMAPRINT],[libchromaprint >= libchromaprint_version], - VLC_ADD_PLUGIN([stream_out_chromaprint fingerprinter]) + VLC_ADD_PLUGIN([stream_out_chromaprint]) VLC_ADD_CFLAGS([stream_out_chromaprint],[${CHROMAPRINT_CFLAGS}] [-I./webservices -I../stream_out]) VLC_ADD_LIBS([stream_out_chromaprint],[${CHROMAPRINT_LIBS}]) - VLC_ADD_LIBS([fingerprinter],[-lm]), AS_IF([test "${enable_chromaprint}" = "yes"], [AC_MSG_ERROR(Library [libchromaprint >= libchromaprint_version] needed for [chromaprint] was not found)], [AC_MSG_WARN(Library [libchromaprint >= libchromaprint_version] needed for [chromaprint] was not found)] diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am index 37377b3..aa317c3 100644 --- a/modules/misc/Modules.am +++ b/modules/misc/Modules.am @@ -1,13 +1,11 @@ SOURCES_vod_rtsp = rtsp.c -SOURCES_audioscrobbler = audioscrobbler.c -SOURCES_fingerprinter = fingerprinter.c \ - webservices/acoustid.c \ - webservices/acoustid.h \ - webservices/json.c \ - webservices/json.h SOURCES_xml = xml/libxml.c +libaudioscrobbler_plugin_la_SOURCES = audioscrobbler.c +libaudioscrobbler_plugin_la_LIBADD = $(SOCKET_LIBS) +misc_LTLIBRARIES += libaudioscrobbler_plugin.la + libexport_plugin_la_SOURCES = \ playlist/html.c \ playlist/m3u.c \ @@ -15,6 +13,12 @@ libexport_plugin_la_SOURCES = \ playlist/export.c misc_LTLIBRARIES += libexport_plugin.la +libfingerprinter_plugin_la_SOURCES = fingerprinter.c \ + webservices/acoustid.c webservices/acoustid.h \ + webservices/json.c webservices/json.h +libfingerprinter_plugin_la_LIBADD = $(LIBM) +misc_LTLIBRARIES += libfingerprinter_plugin.la + libgnutls_plugin_la_SOURCES = gnutls.c dhparams.h libgnutls_plugin_la_CFLAGS = $(AM_CFLAGS) $(GNUTLS_CFLAGS) libgnutls_plugin_la_LIBADD = $(GNUTLS_LIBS) @@ -45,7 +49,6 @@ endif libstats_plugin_la_SOURCES = stats.c misc_LTLIBRARIES += \ - libaudioscrobbler_plugin.la \ liblogger_plugin.la \ libstats_plugin.la _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
