[vlc-commits] Remove broken and useless vlc-config --list

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Aug 18 19:02:28 2011 +0300| [873280f2ada422ea548c38cc641a2053dfe67dca] | committer: Rémi Denis-Courmont

Remove broken and useless vlc-config --list

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=873280f2ada422ea548c38cc641a2053dfe67dca
---

 HACKING          |    4 ++--
 m4/vlc.m4        |    2 --
 vlc-config.in.in |   17 -----------------
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/HACKING b/HACKING
index 0270003..44d3d32 100644
--- a/HACKING
+++ b/HACKING
@@ -69,8 +69,8 @@ file. If you add a new directory you will need to create a new Modules.am,
 inside that directory. Do not forget to add a corresponding
 Makefile line at the end of configure.ac for this new Modules.am file.
 
-To have the module built, you need to add a call to VLC_ADD_PLUGIN or
-VLC_ADD_BUILTINS to configure.ac with your new module name as argument.
+To have the module built, you need to add a call to VLC_ADD_PLUGIN to
+configure.ac with your new module name as argument.
 Look at other modules for guidelines on how to add build and linkage options.
 
 After changing configure.ac you will always need to rerun bootstrap and 
diff --git a/m4/vlc.m4 b/m4/vlc.m4
index e82a47c..abaf0b2 100644
--- a/m4/vlc.m4
+++ b/m4/vlc.m4
@@ -90,8 +90,6 @@ AC_DEFUN([VLC_OUTPUT_VLC_CONFIG_IN], [
   sed -ne '/#@1@#/q;p' < "${srcdir}/vlc-config.in.in" \
     | sed \
           -e "s/@optim@/${enable_optimizations}/" \
-          -e "s/@PLUGINS@/${PLUGINS}/" \
-          -e "s/@BUILTINS@/${BUILTINS}/" \
           -e "s/@CFLAGS_TUNING@/${CFLAGS_TUNING}/" \
     > vlc-config.in
 
diff --git a/vlc-config.in.in b/vlc-config.in.in
index 502b61f..a32c4b4 100644
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -7,8 +7,6 @@ datarootdir="@datarootdir@"
 
 optim="@optim@"
 
-plugins="@PLUGINS@ "
-
 cppflags=""
 cflags=""
 cxxflags=""
@@ -29,7 +27,6 @@ Options:
         [--prefix[=DIR]]          set prefix
         [--exec-prefix[=DIR]]     set exec prefix
         [--version]               print version and exit
-        [--list]                  print modules names and exit
         [--libs]                  output linking flags
         [--cflags]                output C compilation flags
         [--cxxflags]              output C++ compilation flags
@@ -120,9 +117,6 @@ while test $# -gt 0; do
       echo "@VERSION@"
       exit 0
       ;;
-    --list)
-      echo_list=yes
-      ;;
     --cflags)
       echo_cflags=yes
       ;;
@@ -146,9 +140,6 @@ while test $# -gt 0; do
       ;;
     libvlccore)
       ;;
-    plugin)
-      echo_plugin=yes
-      ;;
     *)
       module="$tgt"
       ;;
@@ -170,14 +161,6 @@ fi
 #
 #  Output what we were asked
 #
-if test "${echo_list}" = yes; then
-  if test "${echo_plugin}" = yes; then
-    echo "${plugins}"
-    printf '\n'
-  fi
-  exit 0
-fi
-
 if test "${echo_prefix}" = yes; then
   echo "${prefix}"
 fi