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

diff --git a/Makefile.am b/Makefile.am
index a6d53140c5ac93a86ca8e31d9a90610c4e9820bd..34e4c5e6ca1736def628ebdc127d9a52639401ff 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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)

diff --git a/configure.ac b/configure.ac
index 54dd22638d133a5d19bae1d48a4a7af6198e1866..cc6111671132a773caf3ad1ecb1e1c9bd42227f4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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
 --------------------

diff --git a/toolbox b/toolbox
index 62558b87c565a84d4eaeff34f6a0b8b4d4f5734f..9adb9a83e32121bc281aed6295592667d948c86f 100755 (executable)
--- a/toolbox
+++ b/toolbox
@@ -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}`

diff --git a/vlc-config.in.in b/vlc-config.in.in
index 241081853e6ce68769e8e5702a15e83482934251..10529ccc1c6128ff199fedcc299a3aa10d1d3280 100644 (file)
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -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=""