* added x264 and live to the linux target

[vlc] / toolbox

diff --git a/toolbox b/toolbox
index d3e73b06bf47422fdb3fcf85158f68492c5702ab..5fc742046613c2ec41859de316dd06e929d1c05b 100755 (executable)
--- a/toolbox
+++ b/toolbox
@@ -142,8 +142,7 @@ then
   fi
 
   #  The evil ^M. printf '\r' does not work in Cygwin.
-  M='
-'
+  M='\r'
 
   #  Variables we get from configure.ac
   LIBVLC_VERSION=`sed -ne '/AC_INIT/s/.*,\(.*\))/\1/p' < configure.ac`
@@ -444,37 +443,32 @@ then
     CC="`sed -ne 's/^CC *= *//p' < Makefile`"
   fi
 
-  VLC_COMPILE_TIME=`LC_ALL=C LANG=C date`
-  VLC_COMPILE_BY=`whoami`
-  VLC_COMPILE_HOST=`hostname`
-  if which dnsdomainname 2>&1 >/dev/null; then
-    VLC_COMPILE_DOMAIN=`dnsdomainname`
-  elif which domainname 2>&1 >/dev/null; then
-    VLC_COMPILE_DOMAIN=`domainname`
-  else
-    VLC_COMPILE_DOMAIN=unknown
-  fi
-  VLC_COMPILER=`$CC -v 2>&1 | tail -n 1`
+  file="${builddir}/src/misc/version.c"
   if which svnversion 2>&1 >/dev/null; then
     VLC_CHANGESET=`svnversion $srcdir`
   else
     VLC_CHANGESET='exported'
   fi
 
-  cat >| src/misc/version.c << EOF
+  rm -f ${file}.tmp
+  cat > ${file}.tmp << EOF
 /* DO NOT EDIT THIS FILE - IT IS REGENERATED AT EVERY COMPILE -
- * IT GIVES BETTER TRACKING OFF VLC STABLE AND DEVELOPMENT VERSIONS
- * WETHER THEY ARE BUILD BY OTHERS OR DURING DEVELOPMENT OR FOR THE
+ * IT GIVES BETTER TRACKING OF VLC STABLE AND DEVELOPMENT VERSIONS
+ * WHETHER THEY ARE BUILT BY OTHERS OR DURING DEVELOPMENT OR FOR THE
  * OFFICIAL VLC STABLE RELEASES.
  */
-const char psz_vlc_compile_time[] = "${VLC_COMPILE_TIME}";
-const char psz_vlc_compile_by[] = "${VLC_COMPILE_BY}";
-const char psz_vlc_compile_host[] = "${VLC_COMPILE_HOST}";
-const char psz_vlc_compile_domain[] = "${VLC_COMPILE_DOMAIN}";
-const char psz_vlc_compiler[] = "${VLC_COMPILER}";
 const char psz_vlc_changeset[] = "${VLC_CHANGESET}";
 
 EOF
+  if diff >/dev/null 2>&1 ${file} ${file}.tmp
+  then
+    rm -f ${file}.tmp
+  else
+    echo "creating new ${file}"
+    mv -f ${file}.tmp ${file}
+  fi
+
+  exit 0
 fi
 
 ##