ship vlc_window.h

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 337f1c4dfc95bb812b24f6942a524051da566619..f3bc01d5cb7ee5e8f3af577c7dfcc740b321ccdb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 NULL =
 EXTRA_DIST = extras/COPYING modules/builtin.h.in \
-       vlc-control.pc.in \
+       libvlc.pc.in \
        vlc-plugin.pc.in \
        libvlc.sym \
        libvlccore.sym
@@ -25,7 +25,6 @@ pluginsincludedir = $(pkgincludedir)/plugins
 
 pkginclude_HEADERS = \
        ../include/vlc/vlc.h \
-       ../include/vlc/common.h \
        ../include/vlc/deprecated.h \
        ../include/vlc/libvlc.h \
        ../include/vlc/libvlc_structures.h \
@@ -79,6 +78,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_variables.h \
        ../include/vlc_vlm.h \
        ../include/vlc_vout.h \
+       ../include/vlc_window.h \
        ../include/vlc_xml.h \
        $(NULL)
 
@@ -146,7 +146,7 @@ modules/modules.c: modules/builtin.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
@@ -265,9 +265,9 @@ SOURCES_libvlc_getopt = \
 
 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 \
@@ -322,7 +322,7 @@ SOURCES_libvlc_common = \
        network/tcp.c \
        network/udp.c \
        network/httpd.c \
-       network/rootwrap.c \
+       network/rootbind.c \
        network/tls.c \
        network/poll.c \
        text/charset.c \
@@ -358,11 +358,12 @@ SOURCES_libvlc_common = \
        misc/variables.h \
        misc/variables.c \
        misc/error.c \
-       misc/variables.h \
+       misc/update.h \
        misc/update.c \
        misc/xml.c \
        misc/devices.c \
        extras/libc.c \
+       misc/filter_chain.c \
        $(NULL)
 
 SOURCES_libvlc_sout = \
@@ -427,15 +428,21 @@ misc/revision.c:
 # 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