Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
11477019
Commit
11477019
authored
Nov 01, 2010
by
Rafaël Carré
Browse files
contribs: build automake 1.11.1 on Darwin
OSX automake 1.10 can build the contribs but not VLC
parent
d1743f0e
Changes
4
Hide whitespace changes
Inline
Side-by-side
extras/contrib/src/Distributions/darwin.mak
View file @
11477019
...
...
@@ -7,7 +7,7 @@ all: .freetype .fribidi .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
.dca .tag .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses
\
.schroedinger .libass .libupnp .kate .sqlite3 .Sparkle
TOOLS
=
.libtool .intl .pkgcfg .yasm
TOOLS
=
.libtool .intl .pkgcfg .yasm
.automake
# .expat don't work with SDK yet
# .glib .IDL .gecko are required to build the mozilla plugin
...
...
extras/contrib/src/Distributions/darwin64.mak
View file @
11477019
...
...
@@ -7,7 +7,7 @@ all: .freetype .fribidi .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
.dca .tag .x264 .lua .zvbi .fontconfig .ncurses
\
.schroedinger .libass .libupnp .kate .sqlite3 .Sparkle
TOOLS
=
.libtool .intl .pkgcfg .yasm
TOOLS
=
.libtool .intl .pkgcfg .yasm
.automake
# .expat don't work with SDK yet
# .glib .IDL .gecko are required to build the mozilla plugin
...
...
extras/contrib/src/contrib-src.mak
View file @
11477019
...
...
@@ -298,6 +298,24 @@ CLEAN_FILE += .libtool
endif
# ***************************************************************************
# automake
# ***************************************************************************
automake-$(AUTOMAKE_VERSION).tar.gz
:
$(WGET)
$(AUTOMAKE_URL)
automake
:
automake-$(AUTOMAKE_VERSION).tar.gz
$(EXTRACT_GZ)
.automake
:
automake
(
cd
$<
;
./configure
--prefix
=
$(PREFIX)
&&
make
&&
make
install
)
touch
$@
CLEAN_FILE
+=
.automake
CLEAN_PKG
+=
automake
DISTCLEAN_PKG
+=
automake-
$(AUTOMAKE_VERSION)
.tar.gz
# ***************************************************************************
# pkgconfig
# ***************************************************************************
...
...
extras/contrib/src/packages.mak
View file @
11477019
...
...
@@ -38,6 +38,8 @@ CMAKE_VERSION=2.6.4
CMAKE_URL
=
http://www.cmake.org/files/v2.6/cmake-
$(CMAKE_VERSION)
.tar.gz
LIBTOOL_VERSION
=
2.2.10
LIBTOOL_URL
=
$(GNU)
/libtool/libtool-
$(LIBTOOL_VERSION)
.tar.gz
AUTOMAKE_VERSION
=
1.11.1
AUTOMAKE_URL
=
$(GNU)
/automake/automake-
$(AUTOMAKE_VERSION)
.tar.gz
PKGCFG_VERSION
=
0.23
#PKGCFG_URL=$(CONTRIB_VIDEOLAN)/pkg-config-$(PKGCFG_VERSION).tar.gz
PKGCFG_URL
=
http://pkgconfig.freedesktop.org/releases/pkg-config-
$(PKGCFG_VERSION)
.tar.gz
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment