Commit c3cbe176 authored by Sam Hocevar's avatar Sam Hocevar
Browse files

* ./evc/config.h, ./msvc/config.h: proper generation of these files using

    information from configure.ac.in. Thanks to Stephane van Hardeveld for
    spotting this.
parent b25e0c18
......@@ -2763,10 +2763,10 @@ dnl
dnl Stuff used by the program
dnl
AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION} ${CODENAME}", [Simple version string])
AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VideoLAN Client - version ${VERSION} ${CODENAME} - (c) 1996-2002 VideoLAN", [Copyright string])
AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VideoLAN Client - version ${VERSION} ${CODENAME} - (c) 1996-2003 VideoLAN", [Copyright string])
AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line])
VLC_SYMBOL="`echo ${VERSION} | tr .- __`"
VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-/__/'`"
AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for module functions])
AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions])
AC_DEFINE_UNQUOTED(LIBEXT, "${LIBEXT}", [Dynamic object extension])
......
......@@ -8,6 +8,7 @@ SH4Dbg
SH4Rel
X86EMDbg
X86EMRel
config.h
*.vcp
*.vcl
*.vcb
......
/* config.h. Generated by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
/* config.h.in. Generated by hand. */
/* Maximum supported data alignment */
#define ATTRIBUTE_ALIGNED_MAX 16
......@@ -18,10 +17,10 @@
#define CAN_COMPILE_SSE 1
/* The ./configure command line */
#define CONFIGURE_LINE "./configure --disable-dvd"
#define CONFIGURE_LINE "eMbedded Visual C++"
/* Copyright string */
#define COPYRIGHT_MESSAGE "VideoLAN Client - version 0.5.0-cvs-am Natalya - (c) 1996-2002 VideoLAN"
#define COPYRIGHT_MESSAGE "VideoLAN Client - version @VERSION@ @CODENAME@ - (c) 1996-2003 VideoLAN"
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems.
......@@ -415,10 +414,10 @@
#define LIBEXT ".dll"
/* String suffix for module functions */
#define MODULE_SUFFIX "__0_5_0_cvs_am"
#define MODULE_SUFFIX "__@SYMBOL@"
/* Symbol suffix for module functions */
#define MODULE_SYMBOL 0_5_0_cvs_am
#define MODULE_SYMBOL @SYMBOL@
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
/* #undef NO_MINUS_C_MINUS_O */
......@@ -436,13 +435,13 @@
#define PACKAGE_NAME "vlc"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "vlc 0.5.0-cvs-am"
#define PACKAGE_STRING "vlc @VERSION@"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "vlc"
/* Define to the version of this package. */
#define PACKAGE_VERSION "0.5.0-cvs-am"
#define PACKAGE_VERSION "@VERSION@"
/* Define if <pthread.h> defines pthread_cond_t. */
#define PTHREAD_COND_T_IN_PTHREAD_H 1
......@@ -480,10 +479,10 @@
#define TIME_WITH_SYS_TIME 1
/* Version number of package */
#define VERSION "0.5.0-cvs-am"
#define VERSION "@VERSION@"
/* Simple version string */
#define VERSION_MESSAGE "0.5.0-cvs-am Natalya"
#define VERSION_MESSAGE "@VERSION@ @CODENAME@"
/* big endian system */
/* #undef WORDS_BIGENDIAN */
......
Debug
Release
config.h
*.dsp
*.ncb
*.opt
......
/* config.h. Generated by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
/* config.h.in. Generated by hand. */
/* Maximum supported data alignment */
#define ATTRIBUTE_ALIGNED_MAX 16
......@@ -17,10 +16,10 @@
#define CAN_COMPILE_SSE 1
/* The ./configure command line */
#define CONFIGURE_LINE "./configure --disable-dvd"
#define CONFIGURE_LINE "Visual C++"
/* Copyright string */
#define COPYRIGHT_MESSAGE "VideoLAN Client - version 0.5.0-cvs-am Natalya - (c) 1996-2002 VideoLAN"
#define COPYRIGHT_MESSAGE "VideoLAN Client - version @VERSION@ @CODENAME@ - (c) 1996-2003 VideoLAN"
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems.
......@@ -414,10 +413,10 @@
#define LIBEXT ".dll"
/* String suffix for module functions */
#define MODULE_SUFFIX "__0_5_0_cvs_am"
#define MODULE_SUFFIX "__@SYMBOL@"
/* Symbol suffix for module functions */
#define MODULE_SYMBOL 0_5_0_cvs_am
#define MODULE_SYMBOL @SYMBOL@
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
/* #undef NO_MINUS_C_MINUS_O */
......@@ -435,13 +434,13 @@
#define PACKAGE_NAME "vlc"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "vlc 0.5.0-cvs-am"
#define PACKAGE_STRING "vlc @VERSION@"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "vlc"
/* Define to the version of this package. */
#define PACKAGE_VERSION "0.5.0-cvs-am"
#define PACKAGE_VERSION "@VERSION@"
/* Define if <pthread.h> defines pthread_cond_t. */
#define PTHREAD_COND_T_IN_PTHREAD_H 1
......@@ -479,10 +478,10 @@
#define TIME_WITH_SYS_TIME 1
/* Version number of package */
#define VERSION "0.5.0-cvs-am"
#define VERSION "@VERSION@"
/* Simple version string */
#define VERSION_MESSAGE "0.5.0-cvs-am Natalya"
#define VERSION_MESSAGE "@VERSION@ @CODENAME@"
/* big endian system */
/* #undef WORDS_BIGENDIAN */
......
#! /bin/sh
## toolbox for vlc, the VideoLAN Client
## $Id: toolbox,v 1.4 2003/01/16 09:00:32 sam Exp $
## $Id: toolbox,v 1.5 2003/01/16 12:49:28 sam Exp $
##
## Authors: Samuel Hocevar <sam@zoy.org>
......@@ -75,6 +75,11 @@ then
# The evil ^M
M=' '
# Variables we get from configure.ac.in
LIBVLC_VERSION=`sed -ne '/AC_INIT/s/.*,\(.*\))/\1/p' < configure.ac.in`
LIBVLC_CODENAME=`sed -ne '/CODENAME=/s/.*"\(.*\)"/\1/p' < configure.ac.in`
LIBVLC_SYMBOL=`echo $LIBVLC_VERSION | sed -e 'y/.-/__/'`
# Sources that get built under Win32 - FIXME: anyone wanna deuglify this? :)
LIBVLC_SOURCES=`awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_common'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_win32'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_dirent'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_getopt'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_libc'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'`
......@@ -85,6 +90,16 @@ then
# Clean up
rm -f evc/*.vcp msvc/*.dsp
# config files
for target in evc/config.h msvc/config.h
do
echo "${target}"
rm -f ${target}
sed -e "s/@CODENAME@/${LIBVLC_CODENAME}/" \
-e "s/@VERSION@/${LIBVLC_VERSION}/" \
-e "s/@SYMBOL@/${LIBVLC_SYMBOL}/" < ${target}.in > ${target}
done
# libvlc files
for target in evc/libvlc.vcp msvc/libvlc.dsp
do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment