Changeset 6f924598bfb7bc020915329bce203f949b33dda5

Timestamp:

01/17/05 20:37:38 (3 years ago)

Author:

Derk-Jan Hartman <hartman@videolan.org>

git-committer:

Derk-Jan Hartman <hartman@videolan.org> 1105990658 +0000

git-parent:

[db7ad6de24d7d7f005120ec180f3825b88fcd182]

git-author:

Derk-Jan Hartman <hartman@videolan.org> 1105990658 +0000

Message:

* Added the contrib system to MAKE_DIST
* cleaned up some alignment in configure --help

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (8 diffs)
• toolbox (modified) (3 diffs)

Makefile.am

@@ -248 +248 @@
-    cp $(distdir)/vlc.ebuild $(distdir)/vlc-${VERSION}.ebuild
-    cd $(distdir) && srcdir=$(srcdir) $(srcdir)/toolbox --update-vc
+    distdir=$(distdir) srcdir=$(srcdir) $(srcdir)/toolbox --dist-contrib
-
-###############################################################################

configure.ac

@@ -1305 +1305 @@
-then
-  AC_ARG_WITH(dvdread,
- 
+
-  AC_ARG_WITH(dvdread-tree,
-  [    --with-dvdread-tree=PATH libdvdread tree for static linking])
@@ -1859 +1859 @@
-  else
-    AC_ARG_WITH(ffmpeg-mp3lame,
- 
+specify
-      [
-        VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ])
-
-    AC_ARG_WITH(ffmpeg-faac,
- 
+specify
-      [
-        VLC_ADD_LDFLAGS([ffmpeg],[-lfaac]) ])
-
-    AC_ARG_WITH(ffmpeg-dts,
-
+  specify 
-      [
-        VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) ])
-
-    AC_ARG_WITH(ffmpeg-zlib,
-
+ specify 
-      [
-        VLC_ADD_LDFLAGS([ffmpeg],[-lz]) ])
@@ -2443 +2443 @@
-dnl
-AC_ARG_ENABLE(dirac,
-
+ 
-if test "${enable_dirac}" = "yes"; then
-  AC_CHECK_HEADERS(libdirac_decoder/dirac_parser.h, [
@@ -2478 +2478 @@
-if test "${enable_x264}" != "no"; then
-  AC_ARG_WITH(x264-tree,
- 
+
-  if test "${with_x264_tree}" != "no" -a -n "${with_x264_tree}"
-  then
@@ -2805 +2805 @@
-dnl
-AC_ARG_ENABLE(libxml2,
-
+ 
-if test "${enable_libxml2}" != "no"
-then
@@ -3758 +3758 @@
-dnl
-AC_ARG_ENABLE(daap,
-
+     
-if test "$enable_daap" != "no"
-then
@@ -3822 +3822 @@
-dnl
-AC_ARG_WITH(libgnutls-prefix,
-
+  
-          libgnutls_config_prefix="$withval", libgnutls_config_prefix="")
-
@@ -3864 +3864 @@
-dnl
-AC_ARG_WITH(words,
-
+  
-  case "${with_words}" in
-    big)

toolbox

@@ -30 +30 @@
-  --update-flexml         generate and fix flexml and flex code
-  --distclean             "make distclean" on steroids
+  --dist-contrib          add the contrib dir to MAKE_DIST
-  --make-woody <dir>      change distdir <dir> to a woody distdir
-EOF
@@ -85 +86 @@
-  --add-include)
-    action=include
+    ;;
+  --dist-contrib)
+    action=contrib
-    ;;
-  --help)
@@ -581 +585 @@
-
-##
+## Add the extras/contrib dir to the distribution
+##
+if test "${action}" = "contrib"
+then
+  set -x
+  if test ! -d "${distdir}/extras"
+  then
+    mkdir "${distdir}/extras"
+  fi
+  if test ! -d "${distdir}/extras/contrib"
+  then
+    mkdir "${distdir}/extras/contrib"
+  fi
+  cp "${srcdir}/extras/contrib/Makefile" "${distdir}/extras/contrib/Makefile"
+  cp "${srcdir}/extras/contrib/README" "${distdir}/extras/contrib/README"
+  cp "${srcdir}/extras/contrib/bootstrap" "${distdir}/extras/contrib/bootstrap"
+  cp "${srcdir}/extras/contrib/change_prefix.sh" "${distdir}/extras/contrib/change_prefix.sh"
+  if test ! -d "${distdir}/extras/contrib/src"
+  then
+    mkdir "${distdir}/extras/contrib/src"
+  fi
+  cp "${srcdir}/extras/contrib/src/Makefile" "${distdir}/extras/contrib/src/Makefile"
+  cp "${srcdir}/extras/contrib/src/packages.mak" "${distdir}/extras/contrib/src/packages.mak"
+  if test ! -d "${distdir}/extras/contrib/src/Patches"
+  then
+    mkdir "${distdir}/extras/contrib/src/Patches"
+  fi
+  cp ${srcdir}/extras/contrib/src/Patches/* "${distdir}/extras/contrib/src/Patches/"
+fi
+
+##
-##  Build a woody-friendly package
-##