- vlc -> libvlc for linking shared libvlc.dll

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 7b233cc896d0e680aa8e7875cabaacbe62614565..a8b441192eee7c6704d480666c28261b498526dd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,10 +9,9 @@ SUBDIRS =
 
 EXTRA_DIST = extras/COPYING misc/modules_builtin.h.in
 
-BUILT_SOURCES = $(DISTCLEANFILES) $(CLEANFILES)
-DISTCLEANFILES = stamp-api libvlc.sym
+BUILT_SOURCES = $(CLEANFILES)
 CLEANFILES = misc/modules_builtin.h
-MOSTLYCLEANFILES = $(DATA_noinst_libvlc) stamp-builtins
+MOSTLYCLEANFILES = $(DATA_noinst_libvlc)
 
 TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox
 
@@ -96,50 +95,28 @@ misc/modules_builtin.h: misc/modules_builtin.h.in
 
 misc/modules.c: misc/modules_builtin.h
 
-###############################################################################
-# Building builtin modules
-###############################################################################
-#
-# As long as we use builtins with a shared libvlc, we must build them before
-# we build libvlc. Maybe one day, libvlc will handle multiple modules per
-# shared object, which will make builtins fairly redumdant. Until then, we
-# need this workaround.
-
-
-if BUILD_SHARED
-stamp-builtins: Makefile ../vlc-config ../config.status
-       @for c in `$(VLC_CONFIG) --libs builtin`; do \
-               case $$c in \
-                       ../modules/*.a) echo $$c ;; \
-               esac ; \
-       done | \
-       sed -e 's,^\(.*\)/\([^/]*\)\.a$$,cd \1 \&\& $(MAKE) \2,g' | \
-       while read cmd; do echo $$cmd.a; eval "($$cmd.a)" || exit $$? ; done
-       touch $@
-endif
-
 ###############################################################################
 # Building 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_a_CFLAGS = `$(VLC_CONFIG) --cflags libvlc pic` -DUSE_BUILTINS
+libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc pic`
+libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc pic`
 
 libvlc_la_SOURCES = $(SOURCES_libvlc)
 libvlc_la_LIBADD = $(INCLUDED_LIBINTL)
-libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
-libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
-libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc`
-libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs vlc` \
-       -no-undefined -export-symbols libvlc.sym -version-info 1:0:0
+libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
+libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
+libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
+libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs libvlc` \
+       -no-undefined -export-symbols $(srcdir)/libvlc.sym -version-info 1:0:0
 libvlc_la_DEPENDENCIES = libvlc.sym
 
 libvlc_control_la_SOURCES = $(SOURCES_libvlc_control)
 libvlc_control_la_LIBADD = libvlc.la
-libvlc_control_la_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
+libvlc_control_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
 libvlc_control_la_LDFLAGS = \
        -no-undefined -export-symbols-regex '_?(libvlc|mediacontrol)_.*' \
        -version-info 0:0:0
@@ -184,9 +161,9 @@ endif
 libvlc.dll.a: libvlc$(LIBEXT)
        $(DLLTOOL) --export-all-symbols -l $@ -D $< $(libvlc_a_OBJECTS)
 
-libvlc$(LIBEXT): $(OBJECTS_libvlc_so) stamp-builtins
-       @ldfl="`$(VLC_CONFIG) --libs plugin vlc builtin pic` $(INCLUDED_LIBINTL)" ; \
-       case `$(VLC_CONFIG) --linkage vlc builtin` in \
+libvlc$(LIBEXT): $(OBJECTS_libvlc_so)
+       @ldfl="`$(VLC_CONFIG) --libs plugin libvlc pic` $(INCLUDED_LIBINTL)" ; \
+       case `$(VLC_CONFIG) --linkage libvlc` in \
          c++)  ld="$(CXXLINK)" ;; \
          objc) ld="$(OBJCLINK)" ;; \
          c|*)  ld="$(LINK)" ;; \
@@ -236,6 +213,7 @@ SOURCES_libvlc_common = \
        libvlc.c \
        libvlc-common.c \
        libvlc.h \
+       libvlc-module.c \
        interface/interface.h \
        interface/interface.c \
        interface/intf_eject.c \
@@ -321,7 +299,7 @@ SOURCES_libvlc_common = \
        misc/variables.c \
        misc/error.c \
        misc/update.c \
-       misc/vlm.c \
+       input/vlm.c \
        misc/xml.c \
        misc/dict.c \
        misc/devices.c \
@@ -371,16 +349,17 @@ misc/version.c: FORCE
 ###############################################################################
 # Stamp rules
 ###############################################################################
+
+if !USE_LIBTOOL
+if !BUILD_SHARED
 stamp-api: Makefile.in $(HEADERS_include) ../vlc-api.pl
        ( cd $(srcdir) && cat $(HEADERS_include) ) | \
          top_srcdir="$(top_srcdir)" perl $(top_srcdir)/vlc-api.pl
        touch stamp-api
 
-libvlc.sym: $(HEADERS_include)
-       rm -f libvlc.sym
-       (cd $(srcdir) && cat $(HEADERS_include) ) | \
-       sed -ne 's/^.*VLC_EXPORT\s*(\s*\w.*\S\s*,\s*\(\w*\)\s*,\s*(\s*\w.*\S\s*)\s*)[^)]*$$/\1/p' \
-               > libvlc.sym
+CLEANFILES += stamp-api
+endif
+endif
 
 ###############################################################################
 # Unit/regression test
@@ -389,7 +368,7 @@ if USE_LIBTOOL
 check_PROGRAMS = test_i18n_atof test_url
 TESTS = $(check_PROGRAMS)
 
-CFLAGS_tests = `$(VLC_CONFIG) --cflags vlc`
+CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc`
 
 test_i18n_atof_SOURCES = test/i18n_atof.c
 test_i18n_atof_LDADD = libvlc.la