Contribs update:

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index f3bc01d5cb7ee5e8f3af577c7dfcc740b321ccdb..97520eaf6ab4c87a0eee912fd4cd99913426d849 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 \
@@ -176,11 +177,9 @@ 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
+       -version-info 0:1:0
 libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
 libvlccore_la_DEPENDENCIES = libvlccore.sym
 
@@ -189,7 +188,7 @@ libvlc_la_LIBADD = libvlccore.la
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
        -DMODULE_STRING=\"control\"
 libvlc_la_LDFLAGS = $(AM_LDFLAGS) \
-       -version-info 2:0:0 \
+       -version-info 2:1:0 \
        -export-symbols $(srcdir)/libvlc.sym
 libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
 
@@ -235,7 +234,6 @@ libvlccore_la_SOURCES += $(SOURCES_libvlc_sout)
 endif
 
 SOURCES_libvlc_beos = \
-       misc/beos_specific.cpp \
        $(NULL)
 
 SOURCES_libvlc_darwin = \
@@ -418,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 $@