$(NULL)
BUILT_SOURCES = \
+ vlc-config \
stamp-api \
src/misc/modules_builtin.h \
src/misc/version.c \
$(NULL)
noinst_HEADERS = $(HEADERS_include)
+noinst_DATA = $(DATA_noinst_beos) $(DATA_noinst_libvlc)
HEADERS_include = \
include/aout_internal.h \
src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in vlc-config
srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
- touch $@
+ touch src/misc/modules_builtin.h
src/misc/version.c: FORCE
srcdir=$(srcdir) $(srcdir)/toolbox --update-version
bin_SCRIPTS = vlc-config
vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in
- cd $(top_builddir) && $(SHELL) ./config.status --file=$@
- -cd $(top_builddir) && chmod 0755 $@
+ $(SHELL) ./config.status --file=vlc-config
+ chmod 0755 vlc-config
vlc-config.in: vlc-config.in.in
./config.status --recheck
-$(SOURCES): vlc-config
-
+MOSTLYCLEANFILES = $(DATA_noinst_libvlc)
CLEANFILES = $(BUILT_SOURCES) stamp-builtin
-DISTCLEANFILES = vlc-config.in vlc-config
+DISTCLEANFILES = vlc-config.in
-lib_LIBRARIES = lib/libvlc.a $(LIBRARIES_libvlc_pic)
+if HAVE_WIN32
+lib_LIBRARIES = lib/libvlc.a
+else
+if BUILD_SHARED
+lib_LIBRARIES = lib/libvlc_pic.a
+else
+lib_LIBRARIES = lib/libvlc.a
+if BUILD_MOZILLA
+lib_LIBRARIES += lib/libvlc_pic.a
+endif
+endif
+endif
lib_libvlc_a_SOURCES = $(SOURCES_libvlc)
lib_libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
if BUILD_GETOPT
OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt)
endif
-if BUILD_MOZILLA
-if !HAVE_WIN32
-LIBRARIES_libvlc_pic = lib/libvlc_pic.a
+
+# Build libvlc as a shared library
+if BUILD_SHARED
+DATA_noinst_libvlc = libvlc$(LIBEXT)
+if HAVE_WIN32
+OBJECTS_libvlc_so = $(lib_libvlc_a_OBJECTS)
+else
+OBJECTS_libvlc_so = $(lib_libvlc_pic_a_OBJECTS)
endif
endif
+libvlc$(LIBEXT): $(OBJECTS_libvlc_so)
+ @ldfl="`$(VLC_CONFIG) --libs plugin vlc $(pic) builtin`" ; \
+ case `$(VLC_CONFIG) --linkage vlc` in \
+ c++) ld="$(CXXLINK)" ;; \
+ objc) ld="$(OBJCLINK)" ;; \
+ c|*) ld="$(LINK)" ;; \
+ esac ; \
+ echo $$ld $(OBJECTS_libvlc_so) $$ldfl ; \
+ $$ld $(OBJECTS_libvlc_so) $$ldfl
+
EXTRA_DIST += \
$(SOURCES_libvlc_beos) \
$(SOURCES_libvlc_darwin) \
# Work around a bug in the arm-wince-pe linker
if HAVE_WINCE
-vlc_WORKAROUNDLDFLAGS = lib/libvlc.a
+vlc_WORKAROUNDLDFLAGS = $(LIB_libvlc)
endif
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin` $(vlc_WORKAROUNDLDFLAGS)
-vlc_LDADD = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
+if BUILD_SHARED
+### libvlc.so cannot be created into lib/
+LIB_libvlc = libvlc$(LIBEXT)
+LDFLAGS_libvlc =
+#-Wl,-rpath $(libdir)
+else
+LIB_libvlc = lib/libvlc.a
+LDFLAGS_libvlc = `$(VLC_CONFIG) --libs vlc builtin`
+endif
+
+vlc_LDFLAGS = $(LDFLAGS_libvlc) $(vlc_WORKAROUNDLDFLAGS)
+vlc_LDADD = $(LIB_libvlc) $(DATA_win32_rc) $(LIB_intl)
vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
# We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an
# old automake-1.5 bug (automake/279).
-DEPENDENCIES_vlc = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
+DEPENDENCIES_vlc = $(LIB_libvlc) $(DATA_win32_rc) $(LIB_intl)
vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin
- @rm -f $(top_builddir)/vlc$(EXEEXT)
+ @rm -f vlc$(EXEEXT)
@case `$(VLC_CONFIG) --linkage vlc builtin` in \
- c++) echo $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDFLAGS) $(LIBS) ; $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) $(vlc_LDADD) ;; \
- objc) echo $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDFLAGS) $(LIBS) ; $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) $(vlc_LDADD) ;; \
- c|*) echo $(LINK) $(vlc_OBJECTS) $(vlc_LDFLAGS) $(LIBS) ; $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) $(vlc_LDADD) ;; \
- esac
+ c++) cmd="$(CXXLINK)" ;; \
+ objc) cmd="$(OBJCLINK)" ;; \
+ c|*) cmd="$(LINK)" ;; \
+ esac ; \
+ cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDFLAGS) $(vlc_LDADD) $(LIBS)" ; \
+ echo $$cmd ; \
+ eval $$cmd
if HAVE_BEOS
-noinst_DATA = vlc-bundle
+DATA_noinst_beos = vlc-bundle
vlc-bundle: vlc
rm -Rf $(top_builddir)/vlc-bundle ; mkdir -p $(top_builddir)/vlc-bundle
cp $(top_builddir)/vlc $(top_builddir)/vlc-bundle/
BUILT_SOURCES =
SUBDIRS = ${subdirs}
SUFFIXES = _plugin\$(LIBEXT) _plugin.a
-### TODO ought to be defined somewhere else
libvlcdir = \$(libdir)/vlc/\$(basedir)
EXTRA_LIBRARIES = ${extra_libs}
include Modules.am
-if !BUILD_MOZILLA
-pic = no
-else
-if HAVE_WIN32
-### There's no need for pic code on win32 so get rid of this to substantially
-### reduce the compilation time.
-pic = no
-endif
-endif
-
all: all-modules
# Find out which modules were enabled and tell make to build them
@set fnord \$\$MAKEFLAGS; amf=\$\$2; targets=\`\\
if test "\$(plugin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list plugin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_plugin\$(LIBEXT);; esac; done; fi; \\
if test "\$(builtin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}.a;; esac; done; fi; \\
- if test "\$(pic)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_pic.a;; esac; done; fi; \\
+ if test "\$(pic)" == "pic"; then z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_pic.a;; esac; done; fi; \\
\`; case "\$\$targets" in *lib*) \$(MAKE) \$(AM_MAKEFLAGS) \$\$targets || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; ;; esac; \\
test -z "\$\$fail"
# remove autotools cruft
rm -f aclocal.m4 configure config.log config.h config.h.in
-rm -Rf autom4te.cache
+rm -Rf autom4te*.cache
# remove old autotools extra cruft
rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh
# remove new autotools extra cruft
fi]
AM_CONDITIONAL(HAVE_BUILTINS, ${builtin_support})
+AC_ARG_ENABLE(shared-libvlc,
+ [ --enable-shared-libvlc shared libvlc (default disabled EXPERIMENTAL)],
+ ,[shared_libvlc=no])
+
+AM_CONDITIONAL(BUILD_SHARED, [test "${shared_libvlc}" != "no"])
+
+pic=no
+AS_IF([test "${shared_libvlc}" != "no"], [pic=pic])
+AS_IF([${mozilla}], [pic=pic])
+AS_IF([test "${SYS}" = "mingw32"], [pic=no])
+
+AS_IF([test "${pic}" = "no"], [pic=])
+AC_SUBST(pic)
+
dnl Import conditional variables generated by bootstrap
VLC_CONDITIONALS
dnl AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions])
dnl New definitions with value matching 0.8.2 release
-module_symbol="0_8_2"
+module_symbol="0_8_4"
AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${module_symbol}", [String suffix for module functions])
AC_DEFINE_UNQUOTED(MODULE_SYMBOL, $module_symbol, [Symbol suffix for module functions])
VLC_ENTRY="vlc_entry__${module_symbol}"