NULL =
EXTRA_DIST = extras/COPYING modules/builtin.h.in \
- vlc-control.pc.in \
+ misc/beos_specific.cpp \
+ libvlc.pc.in \
vlc-plugin.pc.in \
+ libvlc.sym \
libvlccore.sym
BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h
pkginclude_HEADERS = \
../include/vlc/vlc.h \
- ../include/vlc/common.h \
../include/vlc/deprecated.h \
../include/vlc/libvlc.h \
../include/vlc/libvlc_structures.h \
../include/vlc_variables.h \
../include/vlc_vlm.h \
../include/vlc_vout.h \
+ ../include/vlc_window.h \
../include/vlc_xml.h \
$(NULL)
../include/vlc_network.h \
../include/vlc_osd.h \
../include/vlc_pgpkey.h \
- ../include/vlc_streaming.h \
../include/vlc_tls.h \
../include/vlc_update.h \
../include/vlc_vod.h \
###############################################################################
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = vlc-control.pc vlc-plugin.pc
+pkgconfig_DATA = libvlc.pc vlc-plugin.pc
CLEANFILES += $(pkgconfig_DATA)
.pc.in.pc: $(top_builddir)/config.status
-DDATA_PATH=\"$(pkgdatadir)\" \
-DLIBDIR=\"$(libdir)\" \
-DPLUGIN_PATH=\"$(pkglibdir)\"
-libvlccore_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
-libvlccore_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
-export-symbols $(srcdir)/libvlccore.sym \
- -version-info 0:0:0
+ -version-info 0:1:0
libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
libvlccore_la_DEPENDENCIES = libvlccore.sym
libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
-DMODULE_STRING=\"control\"
libvlc_la_LDFLAGS = $(AM_LDFLAGS) \
- -version-info 2:0:0 \
- -export-symbols-regex '^_?(libvlc|mediacontrol)_.*'
+ -version-info 2:1:0 \
+ -export-symbols $(srcdir)/libvlc.sym
+libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
EXTRA_libvlccore_la_SOURCES = \
$(SOURCES_libvlc_beos) \
$(SOURCES_libvlc_dirent) \
$(SOURCES_libvlc_getopt) \
$(SOURCES_libvlc_sout) \
+ $(SOURCES_libvlc_vlm) \
$(NULL)
if HAVE_BEOS
libvlccore_la_SOURCES += $(SOURCES_libvlc_beos)
endif
if ENABLE_SOUT
libvlccore_la_SOURCES += $(SOURCES_libvlc_sout)
+if ENABLE_VLM
+libvlccore_la_SOURCES += $(SOURCES_libvlc_vlm)
+endif
endif
SOURCES_libvlc_beos = \
- misc/beos_specific.cpp \
$(NULL)
SOURCES_libvlc_darwin = \
SOURCES_libvlc_common = \
libvlc.c \
- libvlc-common.c \
libvlc.h \
libvlc-module.c \
+ version.c \
interface/interface.h \
interface/interface.c \
interface/intf_eject.c \
network/tcp.c \
network/udp.c \
network/httpd.c \
- network/rootwrap.c \
+ network/rootbind.c \
network/tls.c \
network/poll.c \
text/charset.c \
misc/variables.h \
misc/variables.c \
misc/error.c \
+ misc/update.h \
misc/update.c \
misc/xml.c \
misc/devices.c \
extras/libc.c \
+ misc/filter_chain.c \
$(NULL)
SOURCES_libvlc_sout = \
- input/vlm.c \
- input/vlmshell.c \
stream_output/stream_output.c \
stream_output/stream_output.h \
stream_output/announce.c \
- stream_output/profiles.c \
stream_output/sap.c \
stream_output/sdp.c \
$(NULL)
+SOURCES_libvlc_vlm = \
+ input/vlm.c \
+ input/vlmshell.c \
+ $(NULL)
+
SOURCES_libvlc = \
$(SOURCES_libvlc_common) \
$(OPT_SOURCES_libvlc_beos) \
misc/revision.c:
rm -f $@ $@.tmp
echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@.tmp
- REVISION="$$(LANG=C git --git-dir=$(top_srcdir)/.git show-ref -s HEAD 2>/dev/null || echo exported)"; \
+ REVISION="$$(LANG=C git --git-dir=$(top_srcdir)/.git show-ref --head -s HEAD 2>/dev/null || echo exported)"; \
REVISION="$$(echo $$REVISION|cut -b -10)"; \
echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp
mv -f $@.tmp $@
# Building vlc
###############################################################################
+EXTRA_PROGRAMS = vlc vlc-wrapper
if BUILD_VLC
bin_PROGRAMS = vlc
+if !HAVE_WIN32
+bin_PROGRAMS += vlc-wrapper
+endif
endif
+EXTRA_vlc_SOURCES = vlc.c winvlc.c
if !HAVE_WIN32
vlc_SOURCES = vlc.c
else
vlc_SOURCES = winvlc.c
endif
+vlc_wrapper_SOURCES = network/rootwrap.c
vlc_DEPENDENCIES = $(DATA_win32_rc) libvlc.la