* Revert my [14546] that doesn't work

 * Remove changeset thing from shared libvlc versioning until someone cares to implement it properly within the build system

diff --git a/src/Makefile.am b/src/Makefile.am
index a28498879f138dc264cb1bdb419df2d6732913c9..bcd5a7f3f7c8c519ed337be53ffbd0b61a329be4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ EXTRA_DIST = extras/COPYING misc/modules_builtin.h.in
 
 BUILT_SOURCES = $(DISTCLEANFILES) $(CLEANFILES)
 DISTCLEANFILES = stamp-api
-CLEANFILES = misc/modules_builtin.h stamp-version misc/version.c
+CLEANFILES = misc/modules_builtin.h
 MOSTLYCLEANFILES = $(DATA_noinst_libvlc) stamp-builtins
 
 TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox
@@ -111,15 +111,6 @@ misc/modules_builtin.h: Makefile misc/modules_builtin.h.in ../vlc-config
 
 misc/modules.c: misc/modules_builtin.h
 
-misc/version.c:
-       $(TOOLBOX) --update-version
-
-stamp-version: misc/version.c
-       $(TOOLBOX) --update-version
-       touch $@
-
-.PHONY: stamp-version
-
 ###############################################################################
 # Building builtin modules
 ###############################################################################
@@ -337,7 +328,6 @@ SOURCES_libvlc_common = \
        misc/vlm.c \
        misc/xml.c \
        misc/hashtables.c \
-       misc/version.c \
        extras/libc.c \
        control/core.c \
        control/playlist.c \
@@ -362,7 +352,16 @@ SOURCES_libvlc = \
        $(OPT_SOURCES_libvlc_getopt) \
        $(NULL)
 
+
 if !USE_LIBTOOL
+if !BUILD_SHARED
+SOURCES_libvlc += misc/version.c
+CLEANFILES += misc/version.c
+
+misc/version.c:
+       $(TOOLBOX) --update-version
+endif
+
 # Install shared libvlc
 install-exec-local:
        test -z "$(DATA_noinst_libvlc)" || $(INSTALL_PROGRAM) "$(DATA_noinst_libvlc)" "$(DESTDIR)$(libdir)"

diff --git a/src/libvlc.c b/src/libvlc.c
index 268b1cce3a3524c9a10500d71bd14c5b00445e5f..6f83ad0af40fb3af02b7e0fbfd563140d30a7939 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -158,11 +158,13 @@ DECLARE_VLC_VERSION( CompileHost, COMPILE_HOST );
 DECLARE_VLC_VERSION( CompileDomain, COMPILE_DOMAIN );
 DECLARE_VLC_VERSION( Compiler, COMPILER );
 
+#ifndef HAVE_SHARED_LIBVLC
 extern const char psz_vlc_changeset[];
 char const * VLC_Changeset( void )
 {
     return psz_vlc_changeset;
 }
+#endif
 
 /*****************************************************************************
  * VLC_Error: strerror() equivalent
@@ -2444,9 +2446,11 @@ static void Version( void )
     utf8_fprintf( stdout, _("Compiled by %s@%s.%s\n"),
              VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() );
     utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() );
+#ifndef HAVE_SHARED_LIBVLC
     if( strcmp( VLC_Changeset(), "exported" ) )
         utf8_fprintf( stdout, _("Based upon svn changeset [%s]\n"),
                  VLC_Changeset() );
+#endif
     utf8_fprintf( stdout, LICENSE_MSG );
 
 #ifdef WIN32        /* Pause the console because it's destroyed when we exit */