Updated e-mail address. The wxs.nl address is no longer in use.

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 6751ccc85eddb68f08e49e466ed1eeb634180194..7b1a3e018d421d8e8d0444aae8a86565b7c5ea0d 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -82,29 +82,36 @@ endif
 # ***************************************************************************
 
 ifdef HAVE_DARWIN_OS
-all: .autoconf .libtool .automake .iconv .intl .pkgcfg .freetype .fribidi \
-       .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
-       .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .openslp \
+ all: .autoconf .libtool .automake .iconv .intl .pkgcfg .freetype .fribidi \
+       .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .x264 .theora \
+       .FLAC .speex .faad .faac .lame .twolame .ebml .matroska .ffmpeg .openslp \
        .dvdcss .dvdread .dvdnav .dvbpsi .live .goom2k4 .caca .mod \
-       .png .gpgerror .gcrypt .gnutls .daap .cddb .cdio .vcdimager .aclocal
+       .png .gpg-error .gcrypt .gnutls .daap .cddb .cdio .vcdimager .aclocal
 # mozilla support? add before .aclocal:  .glib .libidl .mozilla
-endif
+else
 
-ifeq ($(HOST),i586-pc-beos)
-ifeq ($(HOST),$(BUILD))
+ ifeq ($(HOST),i586-pc-beos)
+  ifeq ($(HOST),$(BUILD))
 # Native build: we need perl, autoconf, etc first
-all: .perl .autoconf .libtool .automake .iconv .intl .freetype .fribidi \
+   all: .perl .autoconf .libtool .automake .iconv .intl .freetype .fribidi \
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
        .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
        .dvdread .dvdnav .dvbpsi .aclocal
-else
+  else
 # Cross compiling: we already have the Linux tools, only build the
 # libraries now
-all: .iconv .intl .freetype .fribidi \
+   all: .iconv .intl .freetype .fribidi \
+       .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+       .FLAC .speex .faad .faac .lame .twolame .ebml .matroska .ffmpeg .dvdcss \
+       .dvdread .dvdnav .dvbpsi .aclocal
+  endif
+ else
+# Standard Linux or other UNIX-like systems
+   all: .iconv .intl .freetype .fribidi \
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
        .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
        .dvdread .dvdnav .dvbpsi .aclocal
-endif
+ endif
 endif
 
 FORCE:
@@ -287,7 +294,7 @@ gettext: gettext-$(GETTEXT_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -p 0 < Patches/gettext.patch
 
-.intl: gettext
+.intl: gettext .iconv
        ( cd $< && ./configure $(HOSTCONF) --prefix=$(PREFIX) )
 ifeq ($(BUILD),i586-pc-beos)
 # The ugliest kludge ever - so libtool correctly links shared libraries
@@ -638,16 +645,19 @@ DISTCLEAN_PKG += lame-$(LAME_VERSION).tar.gz
 # libebml
 # ***************************************************************************
 
+ifdef SVN
+libebml:
+       $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libebml libebml
+else
 libebml-$(LIBEBML_VERSION).tar.bz2:
        $(WGET) $(LIBEBML_URL)
 
 libebml: libebml-$(LIBEBML_VERSION).tar.bz2
        $(EXTRACT_BZ2)
-       patch -p 0 < Patches/libebml.patch
-       -rm -rf $@/CVS
+endif
 
 .ebml: libebml
-       (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) && make -C make/linux install prefix=$(PREFIX))
+       (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
        $(RANLIB) $(PREFIX)/lib/libebml.a
        touch $@
 
@@ -659,15 +669,19 @@ DISTCLEAN_PKG += libebml-$(LIBEBML_VERSION).tar.bz2
 # libmatroska
 # ***************************************************************************
 
+ifdef SVN
+libmatroska:
+       $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska
+else
 libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
        $(WGET) $(LIBMATROSKA_URL)
 
 libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
        $(EXTRACT_BZ2)
-       -rm -rf $@/CVS
+endif
 
 .matroska: libmatroska
-       (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) && make -C make/linux install prefix=$(PREFIX))
+       (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
        $(RANLIB) $(PREFIX)/lib/libmatroska.a
        touch $@
 
@@ -679,6 +693,9 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 # ffmpeg
 # ***************************************************************************
 
+# Note: at present, we check out the tree from 2005-04-30 because of 
+# compilation issues. We will use the latest version again, when our
+# ffmpeg-module is fixed properly -- FK
 ffmpeg:
        echo $(FFMPEG_CVSROOT) A > ./ffmpeg.cvs
        CVS_PASSFILE=./ffmpeg.cvs cvs -z3 -d $(FFMPEG_CVSROOT) co ffmpeg
@@ -814,7 +831,7 @@ live: live.$(LIVEDOTCOM_VERSION).tar.gz
        patch -p 0 < Patches/live.patch
 
 .live: live
-       (cd $<; ./genmakefiles macosx && make )
+       (cd $<; ./genMakefiles macosx && make )
        touch $@
 
 CLEAN_FILE += .live
@@ -902,6 +919,26 @@ CLEAN_FILE += .dts
 CLEAN_PKG += libdts
 DISTCLEAN_PKG += libdts-$(LIBDTS_VERSION).tar.gz
 
+# ***************************************************************************
+# libdts
+# ***************************************************************************
+
+x264-$(X264_VERSION).tar.gz:
+       $(WGET) $(X264_URL)
+
+x264: x264-$(X264_VERSION).tar.gz
+       $(EXTRACT_GZ)
+       patch -p 0 < Patches/x264.patch
+       rm x264/x264.c
+
+.x264: x264
+       (cd $<; ./configure --enable-pthread --prefix=$(PREFIX) && make && make install)
+       touch $@
+
+CLEAN_FILE += .x264
+CLEAN_PKG += x264
+DISTCLEAN_PKG += x264-$(X264_VERSION).tar.gz
+
 # ***************************************************************************
 # libmodplug
 # ***************************************************************************
@@ -1000,23 +1037,23 @@ CLEAN_PKG += mash-code
 DISTCLEAN_PKG += mash-src-$(MASH_VERSION).tar.gz
 
 # ***************************************************************************
-# toolame
+# twolame
 # ***************************************************************************
 
-toolame-$(TOOLAME_VERSION).tar.bz2:
-       $(WGET) $(TOOLAME_URL)
+twolame-$(TWOLAME_VERSION).tar.gz:
+       $(WGET) $(TWOLAME_URL)
 
-toolame: toolame-$(TOOLAME_VERSION).tar.bz2
-       $(EXTRACT_BZ2)
+twolame: twolame-$(TWOLAME_VERSION).tar.gz
+       $(EXTRACT_GZ)
 
-.toolame: toolame
-       (cd toolame; ./configure --prefix=$(PREFIX) && make && make install)
+.twolame: twolame
+       (cd twolame; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
        $(INSTALL_NAME)
        touch $@
 
-CLEAN_FILE += .toolame
-CLEAN_PKG += toolame
-DISTCLEAN_PKG += toolame-$(TOOLAME_VERSION).tar.bz2
+CLEAN_FILE += .twolame
+CLEAN_PKG += twolame
+DISTCLEAN_PKG += twolame-$(TWOLAME_VERSION).tar.bz2
 
 # ***************************************************************************
 # libpng
@@ -1065,11 +1102,12 @@ libgpg-error-$(GPGERROR_VERSION).tar.gz:
 libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.gz
        $(EXTRACT_GZ)
 
-.gpgerror: libgpg-error
-       (cd $<; ./configure --prefix=$(PREFIX) && make && make install )
+.gpg-error: libgpg-error
+       (cd $<; ./configure --prefix=$(PREFIX) --disable-nls && make && make install )
+       $(INSTALL_NAME)
        touch $@
 
-CLEAN_FILE += .gpgerror
+CLEAN_FILE += .gpg-error
 CLEAN_PKG += libgpg-error
 DISCLEAN_PKG += libgpg-error-$(GPGERROR_VERSION).tar.gz
 
@@ -1084,7 +1122,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -p 0 < Patches/gcrypt.patch
 
-.gcrypt: libgcrypt
+.gcrypt: libgcrypt .gpg-error
        (cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make && make install )
        $(INSTALL_NAME)
        touch $@
@@ -1103,7 +1141,7 @@ gnutls-$(GNUTLS_VERSION).tar.bz2:
 gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2
        $(EXTRACT_BZ2)
 
-.gnutls: gnutls
+.gnutls: gnutls .gcrypt .gpg-error
        (cd $<; ./configure --prefix=$(PREFIX) && make && make install )
        $(INSTALL_NAME)
        touch $@