Commit c3a51903 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove some leftovers from pre-libtool era

(Note __BUILTIN__ was not used anymore as we have !__PLUGIN__)
parent 473a276f
...@@ -113,7 +113,6 @@ mv -f INSTALL.git INSTALL ...@@ -113,7 +113,6 @@ mv -f INSTALL.git INSTALL
## files which need to be regenerated ## files which need to be regenerated
## ##
rm -f vlc-config.in vlc-config rm -f vlc-config.in vlc-config
rm -f src/misc/modules_builtin.h
rm -f stamp-h* rm -f stamp-h*
# Shut up # Shut up
......
...@@ -43,7 +43,6 @@ typedef std::pair<int, std::string> mcpair; ...@@ -43,7 +43,6 @@ typedef std::pair<int, std::string> mcpair;
/* evil hack */ /* evil hack */
#undef __PLUGIN__ #undef __PLUGIN__
#undef __BUILTIN__
#include <../src/modules/modules.h> #include <../src/modules/modules.h>
void ParseModules( mumap &mods, mcmap &mods2 ); void ParseModules( mumap &mods, mcmap &mods2 );
......
...@@ -6,10 +6,6 @@ dnl Macros to add plugins or builtins and handle their flags ...@@ -6,10 +6,6 @@ dnl Macros to add plugins or builtins and handle their flags
m4_pattern_allow([^PKG_CONFIG(_LIBDIR)?$]) m4_pattern_allow([^PKG_CONFIG(_LIBDIR)?$])
AC_DEFUN([VLC_ADD_BUILTINS], [
BUILTINS="${BUILTINS} $1"
])
AC_DEFUN([VLC_ADD_PLUGIN], [ AC_DEFUN([VLC_ADD_PLUGIN], [
m4_foreach_w([element], [$1], [ m4_foreach_w([element], [$1], [
[PLUGINS="${PLUGINS} ]element["] [PLUGINS="${PLUGINS} ]element["]
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
// Pretend we are a builtin module // Pretend we are a builtin module
#define MODULE_NAME main #define MODULE_NAME main
#define MODULE_PATH main #define MODULE_PATH main
#define __BUILTIN__
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
......
...@@ -8,7 +8,6 @@ datarootdir="@datarootdir@" ...@@ -8,7 +8,6 @@ datarootdir="@datarootdir@"
optim="@optim@" optim="@optim@"
plugins="@PLUGINS@ " plugins="@PLUGINS@ "
builtins="@BUILTINS@ "
cppflags="" cppflags=""
cflags="" cflags=""
...@@ -38,7 +37,6 @@ Options: ...@@ -38,7 +37,6 @@ Options:
Modules: Modules:
vlc the main VLC object vlc the main VLC object
plugin flags for plugin modules plugin flags for plugin modules
builtin flags for built-in modules
MODULE any available module (dummy, gtk, avi, etc.) MODULE any available module (dummy, gtk, avi, etc.)
libs flags for external libs libs flags for external libs
BLAH BLAH
...@@ -159,10 +157,6 @@ while test $# -gt 0; do ...@@ -159,10 +157,6 @@ while test $# -gt 0; do
echo_plugin=yes echo_plugin=yes
cppflags="${cppflags} -D__LIBVLC__ -D__PLUGIN__" cppflags="${cppflags} -D__LIBVLC__ -D__PLUGIN__"
;; ;;
builtin)
echo_builtin=yes
cppflags="${cppflags} -D__LIBVLC__ -D__BUILTIN__"
;;
*) *)
module="$tgt" module="$tgt"
;; ;;
...@@ -189,10 +183,6 @@ if test "${echo_list}" = yes; then ...@@ -189,10 +183,6 @@ if test "${echo_list}" = yes; then
echo "${plugins}" echo "${plugins}"
printf '\n' printf '\n'
fi fi
if test "${echo_builtin}" = yes; then
echo "${builtins}"
printf '\n'
fi
exit 0 exit 0
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment