Skip to content

Commit

Permalink
Remove some leftovers from pre-libtool era
Browse files Browse the repository at this point in the history
(Note __BUILTIN__ was not used anymore as we have !__PLUGIN__)
  • Loading branch information
Rémi Denis-Courmont committed May 2, 2011
1 parent 473a276 commit c3a5190
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 18 deletions.
1 change: 0 additions & 1 deletion bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ mv -f INSTALL.git INSTALL
## files which need to be regenerated
##
rm -f vlc-config.in vlc-config
rm -f src/misc/modules_builtin.h
rm -f stamp-h*

# Shut up
Expand Down
1 change: 0 additions & 1 deletion extras/analyser/zsh.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ typedef std::pair<int, std::string> mcpair;

/* evil hack */
#undef __PLUGIN__
#undef __BUILTIN__
#include <../src/modules/modules.h>

void ParseModules( mumap &mods, mcmap &mods2 );
Expand Down
4 changes: 0 additions & 4 deletions m4/vlc.m4
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ dnl Macros to add plugins or builtins and handle their flags
m4_pattern_allow([^PKG_CONFIG(_LIBDIR)?$])


AC_DEFUN([VLC_ADD_BUILTINS], [
BUILTINS="${BUILTINS} $1"
])

AC_DEFUN([VLC_ADD_PLUGIN], [
m4_foreach_w([element], [$1], [
[PLUGINS="${PLUGINS} ]element["]
Expand Down
1 change: 0 additions & 1 deletion src/libvlc-module.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
// Pretend we are a builtin module
#define MODULE_NAME main
#define MODULE_PATH main
#define __BUILTIN__


#ifdef HAVE_CONFIG_H
Expand Down
1 change: 0 additions & 1 deletion src/modules/.gitignore

This file was deleted.

10 changes: 0 additions & 10 deletions vlc-config.in.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ datarootdir="@datarootdir@"
optim="@optim@"

plugins="@PLUGINS@ "
builtins="@BUILTINS@ "

cppflags=""
cflags=""
Expand Down Expand Up @@ -38,7 +37,6 @@ Options:
Modules:
vlc the main VLC object
plugin flags for plugin modules
builtin flags for built-in modules
MODULE any available module (dummy, gtk, avi, etc.)
libs flags for external libs
BLAH
Expand Down Expand Up @@ -159,10 +157,6 @@ while test $# -gt 0; do
echo_plugin=yes
cppflags="${cppflags} -D__LIBVLC__ -D__PLUGIN__"
;;
builtin)
echo_builtin=yes
cppflags="${cppflags} -D__LIBVLC__ -D__BUILTIN__"
;;
*)
module="$tgt"
;;
Expand All @@ -189,10 +183,6 @@ if test "${echo_list}" = yes; then
echo "${plugins}"
printf '\n'
fi
if test "${echo_builtin}" = yes; then
echo "${builtins}"
printf '\n'
fi
exit 0
fi

Expand Down

0 comments on commit c3a5190

Please sign in to comment.