Only load globalhotkeys if requested by caller

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 061e247a58e6ad7e4a8745a4c857f227c1741b82..059b4d43541d513b659544cdd713eded09722b3c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,6 +41,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_acl.h \
        ../include/vlc_aout.h \
        ../include/vlc_arrays.h \
+       ../include/vlc_avcodec.h \
        ../include/vlc_bits.h \
        ../include/vlc_block.h \
        ../include/vlc_block_helper.h \
@@ -50,6 +51,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_config.h \
        ../include/vlc_config_cat.h \
        ../include/vlc_configuration.h \
+       ../include/vlc_dialog.h \
        ../include/vlc_demux.h \
        ../include/vlc_epg.h \
        ../include/vlc_es.h \
@@ -147,17 +149,19 @@ AM_LDFLAGS += -avoid-version
 endif
 
 libvlccore_la_SOURCES = $(SOURCES_libvlc)
-libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
+libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
        -DMODULE_STRING=\"main\" \
        -DLOCALEDIR=\"$(localedir)\" \
        -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DDATA_PATH=\"$(vlcdatadir)\" \
        -DLIBDIR=\"$(libdir)\" \
        -DPLUGIN_PATH=\"$(vlclibdir)\"
-libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
+libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
+       -no-undefined \
        -export-symbols $(srcdir)/libvlccore.sym \
        -version-info 2:0:0
-libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
+libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlccore` $(AM_LIBADD) \
+       $(LTLIBINTL) ../compat/libcompat.la
 libvlccore_la_DEPENDENCIES = libvlccore.sym
 if HAVE_WIN32
 libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
@@ -168,10 +172,10 @@ libvlc_win32_rc.$(OBJEXT): $(top_builddir)/share/libvlc_win32_rc.rc
        $(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
 
 libvlc_la_SOURCES = $(SOURCES_libvlc_control)
-libvlc_la_LIBADD = libvlccore.la
-libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
-       -DMODULE_STRING=\"control\"
-libvlc_la_LDFLAGS = $(AM_LDFLAGS) \
+libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` \
+       libvlccore.la ../compat/libcompat.la
+libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
+libvlc_la_LDFLAGS = $(AM_LDFLAGS) `$(VLC_CONFIG) --ldflags libvlc` \
        -version-info 4:0:2 \
        -export-symbols $(srcdir)/libvlc.sym
 libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
@@ -264,10 +268,9 @@ SOURCES_libvlc_common = \
        libvlc-module.c \
        missing.c \
        version.c \
-       interface/interface.h \
+       interface/dialog.c \
        interface/interface.c \
        interface/intf_eject.c \
-       interface/interaction.c \
        playlist/playlist_internal.h \
        playlist/art.c \
        playlist/art.h \
@@ -308,8 +311,9 @@ SOURCES_libvlc_common = \
        input/input_internal.h \
        input/input_interface.h \
        input/vlm_internal.h \
-       input/ressource.h \
-       input/ressource.c \
+       input/vlm_event.h \
+       input/resource.h \
+       input/resource.c \
        input/stream.c \
        input/stream_demux.c \
        input/stream_filter.c \
@@ -401,6 +405,7 @@ SOURCES_libvlc_sout = \
 
 SOURCES_libvlc_vlm = \
        input/vlm.c \
+       input/vlm_event.c \
        input/vlmshell.c \
        $(NULL)