mirror of https://code.videolan.org/videolan/vlc
* ./bootstrap, ./Makefile.am: workarounds for automake 1.5.
This commit is contained in:
parent
24a7d9c8b0
commit
106497cdb1
|
@ -20,9 +20,6 @@ conftest.cc
|
|||
autom4te.cache
|
||||
Makefile
|
||||
Makefile.in
|
||||
Makefile.opts
|
||||
Makefile.modules
|
||||
Makefile.config
|
||||
Modules.am
|
||||
build-stamp
|
||||
stamp-h*
|
||||
|
|
15
Makefile.am
15
Makefile.am
|
@ -29,6 +29,10 @@ noinst_HEADERS =
|
|||
# Tell aclocal to use -I m4. Wonder if it really works.
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
# XXX: these flags could be set in configure.ac.in, but we set them here
|
||||
# because old versions of automake don't support them in configure.ac.
|
||||
AUTOMAKE_OPTIONS = foreign dist-bzip2 subdir-objects
|
||||
|
||||
###############################################################################
|
||||
# Compilation flags for debug mode, profiling, and others
|
||||
###############################################################################
|
||||
|
@ -217,6 +221,10 @@ endif
|
|||
echo "" >> $@.tmp
|
||||
mv -f $@.tmp $@
|
||||
|
||||
# These dependencies are mandatory
|
||||
$(SOURCES): include/vlc_symbols.h
|
||||
$(SOURCES_libvlc): src/misc/modules_plugin.h src/misc/modules_builtin.h
|
||||
|
||||
###############################################################################
|
||||
# Optional getopt
|
||||
###############################################################################
|
||||
|
@ -288,9 +296,6 @@ EXTRA_DIST += \
|
|||
src/misc/darwin_specific.c \
|
||||
src/misc/win32_specific.c
|
||||
|
||||
BUILT_SOURCES += \
|
||||
src/misc/modules_builtin.h
|
||||
|
||||
SOURCES_libvlc = \
|
||||
src/libvlc.c \
|
||||
src/libvlc.h \
|
||||
|
@ -346,7 +351,7 @@ vlc_SOURCES = src/vlc.c $(SOURCES_libgetopt)
|
|||
# @AUTOMAKE_SUCKS@ gets expanded to $(L_builtin) $(LDFLAGS_builtin)
|
||||
# but we don't write it directly, otherwise automake will go amok and eat all
|
||||
# the memory because of its 2^N crap algorithm. So we fool him. Nuahaha.
|
||||
vlc_LDADD = lib/libvlc.a $(LDFLAGS_vlc) $(noinst_share_vlc_win32_rc_DATA) @AUTOMAKE_SUCKS@
|
||||
vlc_LDADD = lib/libvlc.a $(LDFLAGS_vlc) $(DATA_win32_rc) @AUTOMAKE_SUCKS@
|
||||
vlc_DEPENDENCIES = lib/libvlc.a $(L_builtin)
|
||||
vlc_CFLAGS = $(CPPFLAGS_default) $(CFLAGS_default)
|
||||
|
||||
|
@ -381,6 +386,7 @@ vlc.app: vlc
|
|||
endif
|
||||
|
||||
if HAVE_WIN32
|
||||
DATA_win32_rc = $(noinst_share_vlc_win32_rc_DATA)
|
||||
noinst_share_vlc_win32_rc_DATA = share/vlc_win32_rc.$(OBJEXT)
|
||||
noinst_share_vlc_win32_rcdir = $(libdir)
|
||||
share/vlc_win32_rc.$(OBJEXT): share/vlc_win32_rc.rc
|
||||
|
@ -420,6 +426,7 @@ mozilla_libvlcplugin_a_CXXFLAGS = $(CPPFLAGS_pic) $(CXXFLAGS_pic) \
|
|||
mozilla_libvlcplugin_a_DEPENDENCIES = lib/libvlc_pic.a $(L_builtin_pic)
|
||||
|
||||
BUILT_SOURCES_mozilla = mozilla/vlcintf.h
|
||||
$(SOURCES_mozilla): mozilla/vlcintf.h
|
||||
|
||||
mozilla_libvlcplugin_DATA = mozilla/libvlcplugin$(LIBEXT)
|
||||
mozilla_libvlcplugindir = $(libdir)/mozilla/plugins
|
||||
|
|
19
bootstrap
19
bootstrap
|
@ -1,7 +1,7 @@
|
|||
#! /bin/sh
|
||||
|
||||
## bootstrap file for vlc, the VideoLAN Client
|
||||
## $Id: bootstrap,v 1.14 2002/09/30 11:05:32 sam Exp $
|
||||
## $Id: bootstrap,v 1.15 2002/10/02 12:59:59 sam Exp $
|
||||
##
|
||||
## Authors: Samuel Hocevar <sam@zoy.org>
|
||||
|
||||
|
@ -247,21 +247,18 @@ perl -ne 'if(/^.{500}/) {s/(.{200}[^ ]* )/$1\\\n\t/g} print $_' < Makefile.in >
|
|||
|
||||
autoconf || exit 1
|
||||
|
||||
##
|
||||
## headers which need to be regenerated
|
||||
##
|
||||
rm -f src/misc/modules_builtin.h src/misc/modules_plugin.h
|
||||
rm -f include/vlc_symbols.h
|
||||
rm -f mozilla/vlcintf.h
|
||||
|
||||
##
|
||||
## Shut up
|
||||
##
|
||||
set +x
|
||||
|
||||
##
|
||||
## headers which need to be regenerated because of the VLC_EXPORT macro
|
||||
##
|
||||
files="src/misc/modules_builtin.h src/misc/modules_plugin.h include/vlc_symbols.h"
|
||||
for file in src/misc/modules_builtin.h src/misc/modules_plugin.h include/vlc_symbols.h mozilla/vlcintf.h
|
||||
do
|
||||
echo "touching $file"
|
||||
echo > $file
|
||||
done
|
||||
|
||||
##
|
||||
## Glade sometimes sucks
|
||||
##
|
||||
|
|
|
@ -9,7 +9,9 @@ AC_PREREQ(2.50)
|
|||
AC_CONFIG_SRCDIR(src/libvlc.c)
|
||||
AC_CANONICAL_SYSTEM
|
||||
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
|
||||
dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
|
||||
dnl them. And we need the comma otherwize automake will choke on it.
|
||||
AM_INIT_AUTOMAKE(,)
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
dnl
|
||||
|
|
Loading…
Reference in New Issue