Commit ced88388 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

- build vlc_symbol.h modules_plugin.h and modules_builtin.h in top_builddir

parent e08bae6c
......@@ -263,11 +263,14 @@ dist-hook:
###############################################################################
bin_SCRIPTS = vlc-config
CLEANFILES = $(bin_SCRIPTS)
vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in
cd $(top_builddir) && $(SHELL) ./config.status --file=$@
-cd $(top_builddir) && chmod 0755 $@
$(SOURCES): vlc-config
CLEANFILES = $(BUILT_SOURCES)
lib_LIBRARIES = lib/libvlc.a $(LIBRARIES_libvlc_pic)
lib_libvlc_a_SOURCES = $(SOURCES_libvlc)
......
......@@ -4384,11 +4384,6 @@ AC_CONFIG_FILES([
dnl Generate makefiles
AC_OUTPUT
# Cannot use AC_CONFIG_FILES([vlc-config]) as is automatically built,
# not provided with the source
${SHELL} ./config.status --file=vlc-config
chmod 0755 vlc-config
printf "
vlc configuration
--------------------
......
......@@ -400,10 +400,15 @@ then
if test -z "${srcdir}"; then
srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`"
fi
if test -z "${builddir}"; then
builddir="`sed -ne 's/^top_builddir *= *//p' < Makefile`"
fi
mkdir -p "${builddir}/include"
LIBVLC_HEADERS=`getfiles HEADERS_include`
BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' vlc-config`
file="${srcdir}/include/vlc_symbols.h"
file="${builddir}/include/vlc_symbols.h"
rm -f ${file}.in
echo '/* DO NOT EDIT THIS FILE! See Makefile.am */' >> ${file}.in
......@@ -421,10 +426,10 @@ then
mv -f ${file}.in ${file}
fi
file="${srcdir}/src/misc/modules_plugin.h"
file="${builddir}/src/misc/modules_plugin.h"
rm -f ${file}.tmp && cp ${file}.in ${file}.tmp
sed -e 's#.*\$[I][d]:.*# * Automatically generated from '${file}'.in by bootstrap#' < ${file}.in > ${file}.tmp
rm -f ${file}.tmp
sed -e 's#.*\$[I][d]:.*# * Automatically generated from '${file}'.in by bootstrap#' < ${srcdir}/src/misc/modules_plugin.h.in > ${file}.tmp
echo '#define STORE_SYMBOLS( p_symbols ) \' >> ${file}.tmp
cat ${LIBVLC_HEADERS} | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/ (p_symbols)->\2_inner = \2; \\/' >> ${file}.tmp
echo '' >> ${file}.tmp
......@@ -436,9 +441,9 @@ then
mv -f ${file}.tmp ${file}
fi
file="${srcdir}/src/misc/modules_builtin.h"
file="${builddir}/src/misc/modules_builtin.h"
rm -f ${file}.tmp && cp ${file}.in ${file}.tmp
rm -f ${file}.tmp && cp ${srcdir}/src/misc/modules_builtin.h.in ${file}.tmp
if test -n "${BUILTINS}"
then
for i in `echo ${BUILTINS}`
......
......@@ -83,6 +83,7 @@ fi
if test "${top_builddir}" != ""; then
top_builddir="${top_builddir}/"
fi
includes="${includes} -I${top_builddir}include"
cppflags="${includes}"
libs="-L@libdir@"
module=""
......
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