X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vlc-config.in.in;h=55211fb5ce3f64286c297cd6bda83dac741b1e5c;hb=e02373b9811671df5925c78c260698385a834b9b;hp=fab1af7c36edb5607f6aaaed8ee1ea028d45a972;hpb=c106ef79e1469b9fa9e0cf96a6217152a755e290;p=vlc

diff --git a/vlc-config.in.in b/vlc-config.in.in
index fab1af7c36..55211fb5ce 100644
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -39,7 +39,6 @@ Options:
         [--exec-prefix[=DIR]]     set exec prefix
         [--version]               print version and exit
         [--linkage]               print linkage mode (c, c++, objc)
-        [--target]                print targets and exit
         [--list]                  print modules names and exit
         [--libs]                  output linking flags
         [--cflags]                output C compilation flags
@@ -64,15 +63,6 @@ register_flags()
   esac
 }
 
-register_targets()
-{
-  case "$1" in
-    #@2@#
-    *)
-      ;;
-  esac
-}
-
 if test $# -eq 0; then
         usage 1 1>&2
 fi
@@ -161,9 +151,10 @@ while test $# -gt 0; do
   # Mangle plugin name, if applicable
   # This is just a convenience hack for modules/common.am
   tgt="$1"
+  tgt="${tgt##*/}"
   case "$tgt" in
     lib*_plugin_la-*.lo)
-      tgt="${tgt#lib}"
+      tgt="${tgt#*lib}"
       tgt="${tgt%_plugin_la-*.lo}"
       ;;
     lib*_plugin.la)
@@ -198,9 +189,6 @@ while test $# -gt 0; do
     --linkage)
       echo_linkage=yes
       ;;
-    --target)
-      echo_target=yes
-      ;;
     --list)
       echo_list=yes
       ;;
@@ -240,10 +228,6 @@ while test $# -gt 0; do
       ;;
     mozilla)
       ;;
-    external)
-      echo_external=yes
-      libs="${libs} -lvlc -lvlc-control"
-      ;;
     *)
       module="$tgt"
       ;;
@@ -252,9 +236,6 @@ while test $# -gt 0; do
   # Register per-module *FLAGS
   register_flags "$tgt"
 
-  # Register module targets
-  register_targets "$tgt"
-
   shift
 done
 
@@ -262,45 +243,17 @@ done
 #  If a module was requested, use its name
 #
 if test -n "${module}"; then
-  cppflags="${cppflags} -DMODULE_NAME=${module} -DMODULE_NAME_IS_${module}"
+  cppflags="${cppflags} -DMODULE_NAME=${module} -DMODULE_NAME_IS_${module} -DMODULE_STRING=\"${module}\""
 fi
 
 #
 #  Output what we were asked
 #
 if test "${echo_linkage}" = yes; then
-  if test "${echo_plugin}" = yes; then
-    for module in `echo "${plugins}"`; do
-      register_flags "${module}"
-    done
-  fi
-  if test "${echo_builtin}" = yes; then
-    for module in `echo "${builtins}"`; do
-      register_flags "${module}"
-    done
-  fi
   echo "${linkage}"
   exit 0
 fi
 
-if test "${echo_target}" = yes; then
-  if test "${echo_plugin}" = yes; then
-    for module in `echo "${plugins}"`; do
-      register_targets "${module}"
-    done
-    for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}_plugin "; done
-    printf '\n'
-  fi
-  if test "${echo_builtin}" = yes; then
-    for module in `echo "${builtins}"`; do
-      register_targets "${module}"
-    done
-    for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}.a "; done
-    printf '\n'
-  fi
-  exit 0
-fi
-
 if test "${echo_list}" = yes; then
   if test "${echo_plugin}" = yes; then
     echo "${plugins}"
@@ -338,29 +291,10 @@ fi
 # Libs
 # There are 4 possibilities
 #  - We are a plugin or a builtin
-#  - We are building from the outside (external):
-#	- Give full libvlc linkflags + -lvlc (in libdir)
-# 	- Link with builtins in libdir
 #  - We are building something from the inside (builtin)
 #       - Link with builtins in place
 #  If you want something shared from the inside (binding),
 #  you need "builtin vlc"
 if test "${echo_libs}" = yes; then
-  if test "${echo_builtin}" = yes; then
-    for module in `echo "${builtins}"`; do
-      register_targets "${module}"
-      register_flags "${module}"
-    done
-    for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}.a "; done
-  fi
-  if test "${echo_external}" = yes; then
-    for module in `echo "${builtins}"`; do
-      libs="${libs} @libdir@/vlc/lib${module}.a"
-    done
-    for module in `echo "${builtins}"`; do
-      register_flags "${module}"
-    done
-    register_flags "vlc"
-  fi
   echo "${libs}"
 fi