Remove VLC_Changeset, src/misc/revision.c, fixes make

diff --git a/include/vlc_common.h b/include/vlc_common.h
index a231d8343602e79eec4f0cbaf67b8a8cc206999b..23f27a0bbc1605d2062649b7ad7888bbd05b951c 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -855,7 +855,6 @@ VLC_EXPORT( const char *, VLC_CompileHost, ( void ) LIBVLC_USED );
 VLC_EXPORT( const char *, VLC_CompileDomain, ( void ) LIBVLC_USED );
 VLC_EXPORT( const char *, VLC_Compiler, ( void ) LIBVLC_USED );
 VLC_EXPORT( const char *, VLC_Error, ( int ) LIBVLC_USED );
-VLC_EXPORT( const char *, VLC_Changeset, ( void ) LIBVLC_USED );
 
 /*****************************************************************************
  * Additional vlc stuff

diff --git a/src/Makefile.am b/src/Makefile.am
index 00a32c671376d3804b8764453ab230484786d25e..740f357bdd310337fd627196bc1b2bdb9ffcff8d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -172,7 +172,6 @@ AM_LDFLAGS += -avoid-version
 endif
 
 libvlccore_la_SOURCES = $(SOURCES_libvlc)
-nodist_libvlccore_la_SOURCES = misc/revision.c
 libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
        -DMODULE_STRING=\"main\" \
        -DLOCALEDIR=\"$(localedir)\" \
@@ -464,26 +463,6 @@ SOURCES_libvlc_control = \
        control/mediacontrol_audio_video.c \
        control/media_discoverer.c
 
-###############################################################################
-# Stamp rules
-###############################################################################
-
-misc/revision.c.tmp:
-       rm -f -- $@
-       echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@
-       REVISION="$$(cd "$(top_srcdir)"; git describe 2>/dev/null || echo "$(VERSION)")"; \
-       echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@
-       diff $@ misc/revision.c >/dev/null 2>&1 || \
-               cat misc/revision.c.tmp > misc/revision.c
-
-misc/revision.c:
-       $(MAKE) misc/revision.c.tmp
-       cat misc/revision.c.tmp > misc/revision.c
-
-BUILT_SOURCES += misc/revision.c.tmp misc/revision.c
-
-.PHONY: misc/revision.c.tmp
-
 ###############################################################################
 # Unit/regression test
 ###############################################################################

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index b022e751e452f6696653694e246b203584510128..ee2028acaab51c6d396095f2186bf58089a1521b 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -430,7 +430,6 @@ vlc_b64_decode_binary_to_buffer
 vlc_b64_encode
 vlc_b64_encode_binary
 vlc_cancel
-VLC_Changeset
 vlc_clone
 VLC_CompileBy
 VLC_CompileDomain

diff --git a/src/misc/.gitignore b/src/misc/.gitignore
deleted file mode 100644 (file)
index e9cba81..0000000
--- a/src/misc/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-revision.c

diff --git a/src/version.c b/src/version.c
index 3bac4340ae34c307d12c61de1b5fecb100bf5c6a..e2e7e25102e66e6607bab747b411b12a238d8f68 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -54,9 +54,3 @@ DECLARE_VLC_VERSION( CompileBy, COMPILE_BY );
 DECLARE_VLC_VERSION( CompileHost, COMPILE_HOST );
 DECLARE_VLC_VERSION( CompileDomain, COMPILE_DOMAIN );
 DECLARE_VLC_VERSION( Compiler, COMPILER );
-
-extern const char psz_vlc_changeset[];
-const char* VLC_Changeset( void )
-{
-    return psz_vlc_changeset;
-}