also link libvlc-control in java bindings

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 3dc586fec7354a1cf79f2512bca2a185b2b9d970..a54b283d153185881e9ae28535e8d1fab8c2dc07 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -140,14 +140,13 @@ endif
 # Building libvlc
 ###############################################################################
 
-libvlc_a_SOURCES = $(SOURCES_libvlc)
-nodist_libvlc_a_SOURCES = $(SOURCES_libvlc)
+libvlc_a_SOURCES = $(SOURCES_libvlc) $(SOURCES_libvlc_control)
+nodist_libvlc_a_SOURCES = misc/version.c
 libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc pic` -DUSE_BUILTINS
 libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic`
 libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic`
 
 libvlc_la_SOURCES = $(SOURCES_libvlc)
-nodist_libvlc_la_SOURCES = $(SOURCES_libvlc)
 libvlc_la_LIBADD = $(INCLUDED_LIBINTL)
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
@@ -156,6 +155,12 @@ libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs vlc` \
        -no-undefined -export-symbols libvlc.sym -version-info 0:0:0
 libvlc_la_DEPENDENCIES = stamp-builtins stamp-api
 
+libvlc_control_la_SOURCES = $(SOURCES_libvlc_control)
+libvlc_control_la_LIBADD = libvlc.la
+libvlc_control_la_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
+libvlc_control_la_LDFLAGS = \
+       -no-undefined -export-symbols-regex '_?(libvlc|mediacontrol)_.*' \
+       -version-info 0:0:0
 
 if HAVE_BEOS
 OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos)
@@ -178,7 +183,7 @@ endif
 
 # Build libvlc as a shared library
 if USE_LIBTOOL
-lib_LTLIBRARIES = libvlc.la
+lib_LTLIBRARIES = libvlc.la libvlc-control.la
 else
 lib_LIBRARIES = libvlc.a
 endif
@@ -333,16 +338,6 @@ SOURCES_libvlc_common = \
        misc/dict.c \
        misc/devices.c \
        extras/libc.c \
-       control/core.c \
-       control/log.c \
-       control/playlist.c \
-       control/vlm.c \
-       control/input.c \
-       control/video.c \
-       control/audio.c \
-       control/mediacontrol_core.c \
-       control/mediacontrol_util.c \
-       control/mediacontrol_audio_video.c \
        $(NULL)
 
 SOURCES_libvlc = \
@@ -354,13 +349,21 @@ SOURCES_libvlc = \
        $(OPT_SOURCES_libvlc_getopt) \
        $(NULL)
 
+SOURCES_libvlc_control = \
+       control/core.c \
+       control/log.c \
+       control/playlist.c \
+       control/vlm.c \
+       control/input.c \
+       control/video.c \
+       control/audio.c \
+       control/mediacontrol_core.c \
+       control/mediacontrol_util.c \
+       control/mediacontrol_audio_video.c
+
 if !USE_LIBTOOL
 if !BUILD_SHARED
-SOURCES_nodist_libvlc += misc/version.c
 CLEANFILES += misc/version.c
-
-misc/version.c: FORCE
-       $(TOOLBOX) --update-version
 endif
 
 # Install shared libvlc
@@ -372,6 +375,9 @@ uninstall-local:
        test -z "$(DATA_noinst_libvlc)" || rm -f "$(DESTDIR)$(libdir)/$(DATA_noinst_libvlc)"
 endif
 
+misc/version.c: FORCE
+       $(TOOLBOX) --update-version
+
 ###############################################################################
 # Stamp rules
 ###############################################################################