Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
837f0d29
Commit
837f0d29
authored
Aug 20, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: depollute Makefile variables name space
parent
adc154c0
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
34 additions
and
31 deletions
+34
-31
contrib/src/caca/rules.mak
contrib/src/caca/rules.mak
+9
-3
contrib/src/gcrypt/rules.mak
contrib/src/gcrypt/rules.mak
+9
-10
contrib/src/growl/rules.mak
contrib/src/growl/rules.mak
+4
-4
contrib/src/qt4/rules.mak
contrib/src/qt4/rules.mak
+3
-3
contrib/src/speex/rules.mak
contrib/src/speex/rules.mak
+4
-4
contrib/src/vpx/rules.mak
contrib/src/vpx/rules.mak
+5
-7
No files found.
contrib/src/caca/rules.mak
View file @
837f0d29
...
@@ -24,12 +24,18 @@ ifdef HAVE_WIN32
...
@@ -24,12 +24,18 @@ ifdef HAVE_WIN32
endif
endif
$(MOVE)
$(MOVE)
CONFIGURE_FLAGS
:=
--disable-imlib2
--disable-doc
--disable-ruby
--disable-csharp
--disable-cxx
--disable-java
CACA_CONF
:=
\
--disable-imlib2
\
--disable-doc
\
--disable-ruby
\
--disable-csharp
\
--disable-cxx
\
--disable-java
ifdef
HAVE_MACOSX
ifdef
HAVE_MACOSX
C
ONFIGURE_FLAGS
+=
--disable-x11
C
ACA_CONF
+=
--disable-x11
endif
endif
.caca
:
caca
.caca
:
caca
cd
$<
&&
$(HOSTVARS)
./configure
$(HOSTCONF)
$(C
ONFIGURE_FLAGS
)
cd
$<
&&
$(HOSTVARS)
./configure
$(HOSTCONF)
$(C
ACA_CONF
)
cd
$<
&&
$(MAKE)
-C
$<
install
cd
$<
&&
$(MAKE)
-C
$<
install
touch
$@
touch
$@
contrib/src/gcrypt/rules.mak
View file @
837f0d29
...
@@ -15,29 +15,28 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
...
@@ -15,29 +15,28 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
DEPS_gcrypt
=
gpg-error
DEPS_gcrypt
=
gpg-error
CONFIGURE_OPTS
=
GCRYPT_CONF
=
\
--enable-ciphers
=
aes,des,rfc2268,arcfour
\
--enable-digests
=
sha1,md5,rmd160,sha512
\
--enable-pubkey-ciphers
=
dsa,rsa,ecc
ifdef
HAVE_WIN64
ifdef
HAVE_WIN64
CONFIGURE_OPTS
+=
--disable-asm
GCRYPT_CONF
+=
--disable-asm
endif
endif
ifdef
HAVE_MACOSX
ifdef
HAVE_MACOSX
CONFIGURE_OPTS
+=
--disable-aesni-support
GCRYPT_CONF
+=
--disable-aesni-support
else
else
ifdef
HAVE_BSD
ifdef
HAVE_BSD
CONFIGURE_OPTS
+=
--disable-asm
--disable-aesni-support
GCRYPT_CONF
+=
--disable-asm
--disable-aesni-support
endif
endif
endif
endif
ifdef
HAVE_ANDROID
ifdef
HAVE_ANDROID
ifeq
($(ANDROID_ABI), x86)
ifeq
($(ANDROID_ABI), x86)
CONFIGURE_OPTS
+=
ac_cv_sys_symbol_underscore
=
no
GCRYPT_CONF
+=
ac_cv_sys_symbol_underscore
=
no
endif
endif
endif
endif
.gcrypt
:
libgcrypt
.gcrypt
:
libgcrypt
#
$(RECONF)
#
$(RECONF)
cd
$<
&&
$(HOSTVARS)
./configure
$(HOSTCONF)
\
cd
$<
&&
$(HOSTVARS)
./configure
$(HOSTCONF)
$(GCRYPT_CONF)
--enable-ciphers
=
aes,des,rfc2268,arcfour
\
--enable-digests
=
sha1,md5,rmd160,sha512
\
--enable-pubkey-ciphers
=
dsa,rsa,ecc
\
$(CONFIGURE_OPTS)
cd
$<
&&
$(MAKE)
install
cd
$<
&&
$(MAKE)
install
touch
$@
touch
$@
contrib/src/growl/rules.mak
View file @
837f0d29
...
@@ -13,17 +13,17 @@ $(TARBALLS)/growl-$(GROWL_VERSION).tar.bz2:
...
@@ -13,17 +13,17 @@ $(TARBALLS)/growl-$(GROWL_VERSION).tar.bz2:
.sum-growl
:
growl-$(GROWL_VERSION).tar.bz2
.sum-growl
:
growl-$(GROWL_VERSION).tar.bz2
ifeq
($(shell clang -v 2>/dev/null || echo FAIL),)
ifeq
($(shell clang -v 2>/dev/null || echo FAIL),)
COMPILER
=
com.apple.compilers.llvm.clang.1_0
GROWL_
COMPILER
=
com.apple.compilers.llvm.clang.1_0
else
else
COMPILER
=
com.apple.compilers.gcc.4_2
GROWL_
COMPILER
=
com.apple.compilers.gcc.4_2
endif
endif
growl
:
growl-$(GROWL_VERSION).tar.bz2 .sum-growl
growl
:
growl-$(GROWL_VERSION).tar.bz2 .sum-growl
$(UNPACK)
$(UNPACK)
mv
Growl-1.2.2-src
$@
mv
Growl-1.2.2-src
$@
sed
-i
.orig
-e
s/
"SDKROOT = macosx10.5"
/
"SDKROOT = macosx
$(OSX_VERSION)
"
/g
\
sed
-i
.orig
-e
s/
"SDKROOT = macosx10.5"
/
"SDKROOT = macosx
$(OSX_VERSION)
"
/g
\
-e
s/
"GCC_VERSION = 4.0"
/
"GCC_VERSION =
$(COMPILER)
"
/g
\
-e
s/
"GCC_VERSION = 4.0"
/
"GCC_VERSION =
$(
GROWL_
COMPILER)
"
/g
\
-e
s/com.apple.compilers.gcc.4_0/
$(COMPILER)
/g
\
-e
s/com.apple.compilers.gcc.4_0/
$(
GROWL_
COMPILER)
/g
\
$@
/Growl.xcodeproj/project.pbxproj
$@
/Growl.xcodeproj/project.pbxproj
sed
-i
.orig
-e
s/
"REVISION
\$
$REV
"
/
"REVISION 0x
\$
$REV
"
/g
$@
/generateHgRevision.sh
sed
-i
.orig
-e
s/
"REVISION
\$
$REV
"
/
"REVISION 0x
\$
$REV
"
/g
$@
/generateHgRevision.sh
touch
$@
touch
$@
...
...
contrib/src/qt4/rules.mak
View file @
837f0d29
...
@@ -31,14 +31,14 @@ qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4
...
@@ -31,14 +31,14 @@ qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4
XTOOLS
:=
XCC
=
"
$(CC)
"
XCXX
=
"
$(CXX)
"
XSTRIP
=
"
$(STRIP)
"
XAR
=
"
$(AR)
"
XTOOLS
:=
XCC
=
"
$(CC)
"
XCXX
=
"
$(CXX)
"
XSTRIP
=
"
$(STRIP)
"
XAR
=
"
$(AR)
"
ifdef
HAVE_MACOSX
ifdef
HAVE_MACOSX
PLATFORM
:=
-platform
darwin-g++
QT_
PLATFORM
:=
-platform
darwin-g++
endif
endif
ifdef
HAVE_WIN32
ifdef
HAVE_WIN32
PLATFORM
:=
-xplatform
win32-g++
QT_
PLATFORM
:=
-xplatform
win32-g++
endif
endif
.qt4
:
qt4
.qt4
:
qt4
cd
$<
&&
$(XTOOLS)
./configure
$(PLATFORM)
-static
-release
-fast
-no-exceptions
-no-stl
-no-sql-sqlite
-no-qt3support
-no-gif
-no-libmng
-qt-libjpeg
-no-libtiff
-no-qdbus
-no-openssl
-no-webkit
-sse
-no-script
-no-multimedia
-no-phonon
-opensource
-no-scripttools
-no-opengl
-no-script
-no-scripttools
-no-declarative
-no-declarative-debug
-opensource
-no-s60
-host-little-endian
-confirm-license
cd
$<
&&
$(XTOOLS)
./configure
$(
QT_
PLATFORM)
-static
-release
-fast
-no-exceptions
-no-stl
-no-sql-sqlite
-no-qt3support
-no-gif
-no-libmng
-qt-libjpeg
-no-libtiff
-no-qdbus
-no-openssl
-no-webkit
-sse
-no-script
-no-multimedia
-no-phonon
-opensource
-no-scripttools
-no-opengl
-no-script
-no-scripttools
-no-declarative
-no-declarative-debug
-opensource
-no-s60
-host-little-endian
-confirm-license
cd
$<
&&
$(MAKE)
$(XTOOLS)
sub-src
cd
$<
&&
$(MAKE)
$(XTOOLS)
sub-src
# BUILDING QT BUILD TOOLS
# BUILDING QT BUILD TOOLS
ifdef
HAVE_CROSS_COMPILE
ifdef
HAVE_CROSS_COMPILE
...
...
contrib/src/speex/rules.mak
View file @
837f0d29
...
@@ -28,17 +28,17 @@ speex: speex-$(SPEEX_VERSION).tar.gz .sum-speex
...
@@ -28,17 +28,17 @@ speex: speex-$(SPEEX_VERSION).tar.gz .sum-speex
$(APPLY)
$(SRC)
/speex/neon.patch
$(APPLY)
$(SRC)
/speex/neon.patch
$(MOVE)
$(MOVE)
CONFIG_OPTS
:=
--without-ogg
--enable-resample-full-sinc-table
SPEEX_CONF
:=
--without-ogg
--enable-resample-full-sinc-table
ifndef
HAVE_FPU
ifndef
HAVE_FPU
CONFIG_OPTS
+=
--enable-fixed-point
SPEEX_CONF
+=
--enable-fixed-point
ifeq
($(ARCH),arm)
ifeq
($(ARCH),arm)
CONFIG_OPTS
+=
--enable-arm5e-asm
SPEEX_CONF
+=
--enable-arm5e-asm
endif
endif
endif
endif
.speex
:
speex
.speex
:
speex
$(RECONF)
$(RECONF)
cd
$<
&&
$(HOSTVARS)
./configure
$(HOSTCONF)
$(
CONFIG_OPTS
)
cd
$<
&&
$(HOSTVARS)
./configure
$(HOSTCONF)
$(
SPEEX_CONF
)
cd
$<
&&
$(MAKE)
install
cd
$<
&&
$(MAKE)
install
touch
$@
touch
$@
...
...
contrib/src/vpx/rules.mak
View file @
837f0d29
...
@@ -8,12 +8,6 @@ $(TARBALLS)/libvpx-$(VPX_VERSION).tar.bz2:
...
@@ -8,12 +8,6 @@ $(TARBALLS)/libvpx-$(VPX_VERSION).tar.bz2:
.sum-vpx
:
libvpx-$(VPX_VERSION).tar.bz2
.sum-vpx
:
libvpx-$(VPX_VERSION).tar.bz2
ifneq
($(which bash),/bin/bash)
PATCH_BASH_LOCATION
=
sed
-i
.orig s,^
\#
!
/bin/bash,
\#
!
`
which bash
`
,g
`
grep
-Rl
^
\#
!
/bin/bash libvpx-
$(VPX_VERSION)
`
else
PATCH_BASH_LOCATION
=
true
#bash is in /bin
endif
libvpx
:
libvpx-$(VPX_VERSION).tar.bz2 .sum-vpx
libvpx
:
libvpx-$(VPX_VERSION).tar.bz2 .sum-vpx
$(UNPACK)
$(UNPACK)
$(APPLY)
$(SRC)
/vpx/libvpx-no-cross.patch
$(APPLY)
$(SRC)
/vpx/libvpx-no-cross.patch
...
@@ -22,7 +16,11 @@ ifdef HAVE_MACOSX
...
@@ -22,7 +16,11 @@ ifdef HAVE_MACOSX
$(APPLY)
$(SRC)
/vpx/libvpx-mac.patch
$(APPLY)
$(SRC)
/vpx/libvpx-mac.patch
$(APPLY)
$(SRC)
/vpx/libvpx-mac-mountain-lion.patch
$(APPLY)
$(SRC)
/vpx/libvpx-mac-mountain-lion.patch
endif
endif
$(PATCH_BASH_LOCATION)
ifneq
($(which bash),/bin/bash)
sed
-i
.orig
\
s,^
\#
!
/bin/bash,
\#
!
`
which bash
`
,g
\
`
grep
-Rl
^
\#
!
/bin/bash libvpx-
$(VPX_VERSION)
`
endif
$(MOVE)
$(MOVE)
DEPS_vpx
=
DEPS_vpx
=
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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