Browse Source

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

pull/2/head
Rémi Denis-Courmont 17 years ago
parent
commit
046bfcf151
  1. 1
      include/vlc_common.h
  2. 21
      src/Makefile.am
  3. 1
      src/libvlccore.sym
  4. 1
      src/misc/.gitignore
  5. 6
      src/version.c

1
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

21
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
###############################################################################

1
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

1
src/misc/.gitignore

@ -1 +0,0 @@
revision.c

6
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;
}

Loading…
Cancel
Save