From: Rémi Denis-Courmont <rdenis@simphalempin.com>
Date: Sat, 14 Feb 2009 12:00:25 +0000 (+0200)
Subject: Remove VLC_Changeset, src/misc/revision.c, fixes make
X-Git-Tag: 1.0.0-pre1~672
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=046bfcf1517610b52fb3a39bfc4ddb79cced6ca7;p=vlc

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

diff --git a/include/vlc_common.h b/include/vlc_common.h
index a231d83436..23f27a0bbc 100644
--- 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 00a32c6713..740f357bdd 100644
--- 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 b022e751e4..ee2028acaa 100644
--- 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
index e9cba818a7..0000000000
--- a/src/misc/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-revision.c
diff --git a/src/version.c b/src/version.c
index 3bac4340ae..e2e7e25102 100644
--- 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;
-}