Commit 453fe58a authored by Sam Hocevar's avatar Sam Hocevar

* ./autotools/: moved some autotools executables to this subdirectory to

    reduce cluttering of the root directory.
parent 78ea76bc
...@@ -13,8 +13,6 @@ config.log ...@@ -13,8 +13,6 @@ config.log
config.cache config.cache
config.rpath config.rpath
config.status config.status
config.guess
config.sub
confdefs.h confdefs.h
conftest.cc conftest.cc
autom4te.cache autom4te.cache
...@@ -24,11 +22,6 @@ Modules.am ...@@ -24,11 +22,6 @@ Modules.am
build-stamp build-stamp
stamp-h* stamp-h*
aclocal.m4 aclocal.m4
install-sh
missing
mkinstalldirs
compile
depcomp
vlc-debug.* vlc-debug.*
vlc-log.* vlc-log.*
vlc-config vlc-config
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# something. DIST_SUBDIRS stores the directories where nothing is built but # something. DIST_SUBDIRS stores the directories where nothing is built but
# which have makefiles with distribution information. # which have makefiles with distribution information.
SUBDIRS = po intl m4 share SUBDIRS = po intl m4 share
DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib autotools
EXTRA_DIST = HACKING MAINTAINERS src/extras/COPYING \ EXTRA_DIST = HACKING MAINTAINERS src/extras/COPYING \
INSTALL.win32 README.MacOSX.rtf vlc.spec install-win32 \ INSTALL.win32 README.MacOSX.rtf vlc.spec install-win32 \
......
.dirstamp
Makefile
Makefile.in
compile
config.guess
config.sub
depcomp
install-sh
missing
mkinstalldirs
#! /bin/sh #! /bin/sh
## bootstrap file for the VLC media player ## bootstrap file for the VLC media player
## $Id: bootstrap,v 1.44 2003/03/12 04:16:02 sam Exp $ ## $Id: bootstrap,v 1.45 2003/03/17 16:59:46 sam Exp $
## ##
## Authors: Samuel Hocevar <sam@zoy.org> ## Authors: Samuel Hocevar <sam@zoy.org>
...@@ -173,7 +173,17 @@ echo "done." ...@@ -173,7 +173,17 @@ echo "done."
### classic bootstrap stuff ### classic bootstrap stuff
### ###
set -x set -x
rm -f aclocal.m4 m4/oldgettext.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh ABOUT-NLS
# remove autotools cruft
rm -f aclocal.m4 configure config.log
# remove old autotools extra cruft
rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh
# remove new autotools extra cruft
(cd autotools && rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh)
# remove libtool cruft
rm -f ltmain.sh libtool ltconfig
# remove gettext cruft
rm -f m4/oldgettext.m4 ABOUT-NLS
rm -Rf intl rm -Rf intl
# Check for gettext # Check for gettext
......
...@@ -7,6 +7,7 @@ CODENAME="Natalya" ...@@ -7,6 +7,7 @@ CODENAME="Natalya"
AC_PREREQ(2.50) AC_PREREQ(2.50)
AC_CONFIG_SRCDIR(src/libvlc.c) AC_CONFIG_SRCDIR(src/libvlc.c)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
dnl XXX: we don't put any flags here, because automake 1.5 doesn't support dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
...@@ -495,6 +496,8 @@ fi ...@@ -495,6 +496,8 @@ fi
dnl Build the gtk_main plugins? dnl Build the gtk_main plugins?
NEED_GTK_MAIN=no NEED_GTK_MAIN=no
NEED_GNOME_MAIN=no NEED_GNOME_MAIN=no
NEED_GTK2_MAIN=no
NEED_GNOME2_MAIN=no
dnl build the qte plugin ? dnl build the qte plugin ?
NEED_QTE_MAIN=no NEED_QTE_MAIN=no
...@@ -2279,6 +2282,22 @@ then ...@@ -2279,6 +2282,22 @@ then
fi fi
fi fi
dnl
dnl Gtk+2 module
dnl
AC_ARG_ENABLE(gtk2,
[ --enable-gtk2 Gtk2 support (default disabled)])
if test "x${enable_gtk2}" = "xyes"
then
PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
CFLAGS_gtk2="${CFLAGS_gtk2} ${GTK2_CFLAGS}"
LDFLAGS_gtk2="${LDFLAGS_gtk2} ${GTK2_LIBS}"
PLUGINS="${PLUGINS} gtk2"
if test "x${SYS}" != "xmingw32"; then
NEED_GTK2_MAIN=yes
fi
fi
dnl dnl
dnl Familiar module uses Gtk+ library dnl Familiar module uses Gtk+ library
dnl dnl
...@@ -2395,6 +2414,22 @@ developement tools or remove the --enable-gnome option]) ...@@ -2395,6 +2414,22 @@ developement tools or remove the --enable-gnome option])
CPPFLAGS="${CPPFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}"
fi]) fi])
dnl
dnl Gnome2 module
dnl
AC_ARG_ENABLE(gnome2,
[ --enable-gnome2 Gnome2 support (default disabled)])
if test "x${enable_gnome2}" = "xyes"
then
PKG_CHECK_MODULES(GNOME2, [libgnomeui-2.0])
CFLAGS_gnome2="${CFLAGS_gnome2} ${GNOME2_CFLAGS}"
LDFLAGS_gnome2="${LDFLAGS_gnome2} ${GNOME2_LIBS}"
PLUGINS="${PLUGINS} gnome2"
if test "x${SYS}" != "xmingw32"; then
NEED_GNOME2_MAIN=yes
fi
fi
dnl dnl
dnl wxWindows module dnl wxWindows module
dnl dnl
...@@ -2769,7 +2804,7 @@ if test "x${NEED_GTK_MAIN}" != "xno" ...@@ -2769,7 +2804,7 @@ if test "x${NEED_GTK_MAIN}" != "xno"
then then
PLUGINS="${PLUGINS} gtk_main" PLUGINS="${PLUGINS} gtk_main"
CFLAGS_gtk="${CFLAGS_gtk} -DNEED_GTK_MAIN" CFLAGS_gtk="${CFLAGS_gtk} -DNEED_GTK_MAIN"
CFLAGS_familiar="${CFLAGS_familiar} -DNEED_GTK_MAIN" CFLAGS_familiar="${CFLAGS_familiar} -DNEED_GTK_MAIN"
CFLAGS_gtk_main="${CFLAGS_gtk_main} ${CFLAGS_gtk} ${CFLAGS_familiar}" CFLAGS_gtk_main="${CFLAGS_gtk_main} ${CFLAGS_gtk} ${CFLAGS_familiar}"
LDFLAGS_gtk_main="${LDFLAGS_gtk_main} ${LDFLAGS_gtk} ${LDFLAGS_familiar}" LDFLAGS_gtk_main="${LDFLAGS_gtk_main} ${LDFLAGS_gtk} ${LDFLAGS_familiar}"
fi fi
...@@ -2781,6 +2816,21 @@ then ...@@ -2781,6 +2816,21 @@ then
LDFLAGS_gnome_main="${LDFLAGS_gnome_main} ${LDFLAGS_gtk} ${LDFLAGS_familiar} ${LDFLAGS_gnome}" LDFLAGS_gnome_main="${LDFLAGS_gnome_main} ${LDFLAGS_gtk} ${LDFLAGS_familiar} ${LDFLAGS_gnome}"
fi fi
if test "x${NEED_GTK2_MAIN}" != "xno"
then
PLUGINS="${PLUGINS} gtk2_main"
CFLAGS_gtk2="${CFLAGS_gtk2} -DNEED_GTK2_MAIN"
CFLAGS_gtk2_main="${CFLAGS_gtk2_main} ${CFLAGS_gtk2}"
LDFLAGS_gtk2_main="${LDFLAGS_gtk2_main} ${LDFLAGS_gtk2}"
fi
if test "x${NEED_GNOME2_MAIN}" != "xno"
then
PLUGINS="${PLUGINS} gnome2_main"
CFLAGS_gnome2_main="${CFLAGS_gnome2_main} ${CFLAGS_gtk2} ${CFLAGS_gnome2}"
LDFLAGS_gnome2_main="${LDFLAGS_gnome2_main} ${LDFLAGS_gtk2} ${LDFLAGS_gnome2}"
fi
dnl dnl
dnl qte_main plugin dnl qte_main plugin
dnl dnl
...@@ -2920,6 +2970,7 @@ AC_SUBST(LDFLAGS_mozilla) ...@@ -2920,6 +2970,7 @@ AC_SUBST(LDFLAGS_mozilla)
AC_OUTPUT([ AC_OUTPUT([
Makefile Makefile
autotools/Makefile
debian/Makefile debian/Makefile
doc/Makefile doc/Makefile
intl/Makefile intl/Makefile
......
#! /bin/sh #! /bin/sh
## toolbox for the VLC media player ## toolbox for the VLC media player
## $Id: toolbox,v 1.14 2003/03/12 05:12:05 sam Exp $ ## $Id: toolbox,v 1.15 2003/03/17 16:59:46 sam Exp $
## ##
## Authors: Samuel Hocevar <sam@zoy.org> ## Authors: Samuel Hocevar <sam@zoy.org>
...@@ -42,11 +42,6 @@ getfiles() ...@@ -42,11 +42,6 @@ getfiles()
### ###
### argument check ### argument check
### ###
do_changelog=no
do_po=no
do_vc=no
do_includes=no
do_glade=no
if test "$1" = "" if test "$1" = ""
then then
...@@ -55,19 +50,19 @@ fi ...@@ -55,19 +50,19 @@ fi
case "$1" in case "$1" in
--update-changelog) --update-changelog)
do_changelog=yes action=changelog
;; ;;
--update-vc) --update-vc)
do_vc=yes action=vc
;; ;;
--update-po) --update-po)
do_po=yes action=po
;; ;;
--update-includes) --update-includes)
do_includes=yes action=includes
;; ;;
--update-glade|--fix-glade) --update-glade|--fix-glade)
do_glade=yes action=glade
;; ;;
--help) --help)
help help
...@@ -82,7 +77,7 @@ shift ...@@ -82,7 +77,7 @@ shift
## ##
## Update the CVS changelog ## Update the CVS changelog
## ##
if test "$do_changelog" = "yes" if test "${action}" = "changelog"
then then
cvs2cl --help >/dev/null 2>&1 || exit 1 cvs2cl --help >/dev/null 2>&1 || exit 1
rm -f ChangeLog rm -f ChangeLog
...@@ -95,7 +90,7 @@ fi ...@@ -95,7 +90,7 @@ fi
## ##
## Update the MSVC project files ## Update the MSVC project files
## ##
if test "$do_vc" = "yes" if test "${action}" = "vc"
then then
echo "generating Visual Studio files..." echo "generating Visual Studio files..."
...@@ -311,7 +306,7 @@ fi ...@@ -311,7 +306,7 @@ fi
## ##
## Update the potfiles because no one ever does it ## Update the potfiles because no one ever does it
## ##
if test "$do_po" = "yes" if test "${action}" = "po"
then then
# create a fake file containing win32 strings # create a fake file containing win32 strings
rm -f modules/gui/win32/strings.cpp rm -f modules/gui/win32/strings.cpp
...@@ -335,7 +330,7 @@ fi ...@@ -335,7 +330,7 @@ fi
## ##
## Create include files ## Create include files
## ##
if test "$do_includes" = "yes" if test "${action}" = "includes"
then then
set -x set -x
...@@ -409,7 +404,7 @@ fi ...@@ -409,7 +404,7 @@ fi
## ##
## Fix glade-generated files ## Fix glade-generated files
## ##
if test "$do_glade" = "yes" if test "${action}" = "glade"
then then
for file in modules/gui/gtk/gnome.glade modules/gui/gtk/gtk.glade modules/gui/familiar/familiar.glade for file in modules/gui/gtk/gnome.glade modules/gui/gtk/gtk.glade modules/gui/familiar/familiar.glade
do do
......
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