Commit 8d3c9990 authored by Felix Paul Kühne's avatar Felix Paul Kühne

Fixed INSTALL_NAME for libfaad2 which was broken in [65d362fe]

parent b8708ee9
...@@ -134,7 +134,7 @@ endif ...@@ -134,7 +134,7 @@ endif
ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS
all: .autoconf .automake .libtool .intl .pkgcfg .freetype .fribidi \ all: .autoconf .automake .libtool .intl .pkgcfg .freetype .fribidi \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \ .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.FLAC .speex .shout .faad2 .faac .lame .twolame .ebml .matroska .ffmpeg \ .FLAC .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
.dvdcss .dvdnav .dvdread .dvbpsi .live .x264 .caca .mod \ .dvdcss .dvdnav .dvdread .dvbpsi .live .x264 .caca .mod \
.png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \ .png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \
.glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder .aclocal \ .glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder .aclocal \
...@@ -154,14 +154,14 @@ else ...@@ -154,14 +154,14 @@ else
# Native build: we need perl, autoconf, etc first # Native build: we need perl, autoconf, etc first
all: .perl .autoconf .automake .libtool .iconv .intl .freetype .fribidi \ all: .perl .autoconf .automake .libtool .iconv .intl .freetype .fribidi \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \ .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.FLAC .speex .faad2 .faac .lame .ebml .matroska .ffmpeg .dvdcss \ .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
.dvdnav .dvbpsi .aclocal .libdca .dvdnav .dvbpsi .aclocal .libdca
else else
# Cross compiling: we already have the Linux tools, only build the # Cross compiling: we already have the Linux tools, only build the
# libraries now # libraries now
all: .iconv .intl .freetype .fribidi \ all: .iconv .intl .freetype .fribidi \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \ .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.FLAC .speex .faad2 .faac .lame .twolame .ebml .matroska .ffmpeg .dvdcss \ .FLAC .speex .faad .faac .lame .twolame .ebml .matroska .ffmpeg .dvdcss \
.dvdnav .dvbpsi .aclocal .libdca .dvdnav .dvbpsi .aclocal .libdca
endif endif
else else
...@@ -170,7 +170,7 @@ else ...@@ -170,7 +170,7 @@ else
all: .iconv .intl .freetype .fribidi .zlib \ all: .iconv .intl .freetype .fribidi .zlib \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .shout .vorbisenc .theora \ .a52 .mpeg2 .id3tag .mad .ogg .vorbis .shout .vorbisenc .theora \
.FLAC .speex .faad2 .faac .lame .ebml .matroska .ffmpeg .dvdcss \ .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
.live .goom2k4 .caca .mod .x264 .xml .twolame \ .live .goom2k4 .caca .mod .x264 .xml .twolame \
.png .gpg-error .gcrypt .gnutls .mpcdec \ .png .gpg-error .gcrypt .gnutls .mpcdec \
.dvdnav .dvbpsi .wxwidgets .dirac .SDL_image \ .dvdnav .dvbpsi .wxwidgets .dirac .SDL_image \
...@@ -180,13 +180,13 @@ else ...@@ -180,13 +180,13 @@ else
ifdef HAVE_WINCE ifdef HAVE_WINCE
all: .dvbpsi .zlib .ffmpeg .ogg .tremor .faad2 all: .dvbpsi .zlib .ffmpeg .ogg .tremor .faad
else else
# Standard Linux or other UNIX-like systems # Standard Linux or other UNIX-like systems
all: .iconv .intl .freetype .fribidi .zlib \ all: .iconv .intl .freetype .fribidi .zlib \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \ .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.FLAC .speex .faad2 .faac .lame .ebml .matroska .ffmpeg .dvdcss \ .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
.live .goom2k4 .caca .mod .x264 .xml .twolame \ .live .goom2k4 .caca .mod .x264 .xml .twolame \
.png .gpg-error .gcrypt .gnutls .mpcdec \ .png .gpg-error .gcrypt .gnutls .mpcdec \
.dvdnav .dvbpsi .wxwidgets .dirac \ .dvdnav .dvbpsi .wxwidgets .dirac \
...@@ -808,12 +808,12 @@ faad2: faad2-$(FAAD2_VERSION).tar.gz ...@@ -808,12 +808,12 @@ faad2: faad2-$(FAAD2_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
(cd $@; ./bootstrap) (cd $@; ./bootstrap)
.faad2: faad2 .faad: faad2
(cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && sed -i.orig "s/shrext_cmds/shrext/g" libtool && make -C libfaad && make -C libfaad install) (cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && sed -i.orig "s/shrext_cmds/shrext/g" libtool && make -C libfaad && make -C libfaad install)
$(INSTALL_NAME) $(INSTALL_NAME)
touch $@ touch $@
CLEAN_FILE += .faad2 CLEAN_FILE += .faad
CLEAN_PKG += faad2 CLEAN_PKG += faad2
DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz
......
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