vlc_object_kill: remove the libvlc-specific hack

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 089541234622cba2016a08248bef0415e13061c1..fcc9e2cc5ea321ebe158e2e973df949925f3212a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,6 +6,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 NULL =
 EXTRA_DIST = extras/COPYING modules/builtin.h.in \
+       misc/beos_specific.cpp \
        libvlc.pc.in \
        vlc-plugin.pc.in \
        libvlc.sym \
@@ -78,6 +79,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_variables.h \
        ../include/vlc_vlm.h \
        ../include/vlc_vout.h \
+       ../include/vlc_window.h \
        ../include/vlc_xml.h \
        $(NULL)
 
@@ -175,8 +177,6 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
        -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
@@ -234,7 +234,6 @@ libvlccore_la_SOURCES += $(SOURCES_libvlc_sout)
 endif
 
 SOURCES_libvlc_beos = \
-       misc/beos_specific.cpp \
        $(NULL)
 
 SOURCES_libvlc_darwin = \
@@ -321,7 +320,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 \
@@ -362,6 +361,7 @@ SOURCES_libvlc_common = \
        misc/xml.c \
        misc/devices.c \
        extras/libc.c \
+       misc/filter_chain.c \
        $(NULL)
 
 SOURCES_libvlc_sout = \
@@ -416,7 +416,7 @@ SOURCES_libvlc_control = \
 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 $@
@@ -426,15 +426,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