Changeset b5390911cbc2a5f1f791f386d459d7dc5a55fc4b

Timestamp:

20/05/07 10:38:20 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1179650300 +0000

git-parent:

[8dc109b26259669a7a76a25c7ca2a12827de5d07]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1179650300 +0000

Message:

Fix SVN revision handling.
It is by design flawed to have phony built source.

Files:

• src/Makefile.am (modified) (8 diffs)
• src/libvlc-common.c (modified) (1 diff)
• src/libvlc.c (modified) (1 diff)
• src/libvlc.h (modified) (1 diff)

src/Makefile.am

@@ -1 @@
-
+
-# Automake targets and declarations
-###############################################################################
@@ -11 +11 @@
-
-BUILT_SOURCES = $(CLEANFILES)
-
+ misc/revision.c
-MOSTLYCLEANFILES = $(DATA_noinst_libvlc)
-
@@ -103 +103 @@
-
-libvlc_a_SOURCES = $(SOURCES_libvlc) $(SOURCES_libvlc_control)
+nodist_libvlc_a_SOURCES = misc/revision.c
-libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags libvlc pic` -DUSE_BUILTINS
-libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc pic`
@@ -108 +109 @@
-
-libvlc_la_SOURCES = $(SOURCES_libvlc)
+nodist_libvlc_la_SOURCES = misc/revision.c
-libvlc_la_LIBADD = $(INCLUDED_LIBINTL)
-libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
@@ -147 +149 @@
-else
-lib_LIBRARIES = libvlc.a
-endif
-
-if HAVE_WIN32
-pic =
-else
-pic = pic
-endif
-
@@ -335 +331 @@
-if !USE_LIBTOOL
-if !HAVE_WIN32
-nodist_libvlc_a_SOURCES = misc/version.c
-CLEANFILES += misc/version.c
-
-misc/version.c: FORCE
-    $(TOOLBOX) --update-version
-endif
-
@@ -366 +357 @@
-endif
-
+misc/revision.c:
+    rm -f $@ $@.tmp
+    echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@.tmp
+    REVISION="$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)" ; \
+    echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp
+    mv -f $@.tmp $@
+
-###############################################################################
-# Unit/regression test
@@ -388 +386 @@
-
-FORCE:
+    @echo "Generated source cannot be phony. Go away." >&2
+    @exit 1
+
+.PHONY: FORCE

src/libvlc-common.c

@@ -1831 +1831 @@
-             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 );
-

src/libvlc.c

@@ -70 +70 @@
-DECLARE_VLC_VERSION( Compiler, COMPILER );
-
-#ifndef HAVE_SHARED_LIBVLC
-extern const char psz_vlc_changeset[];
-har const 
+onst char
-{
-    return psz_vlc_changeset;
-}
-#endif
-
-/*****************************************************************************

src/libvlc.h

@@ -35 +35 @@
-                   const char *psz_type);
-
-0
+1
-/*****************************************************************************
- * libvlc_global_data_t (global variable)