Changeset 32f9d615e87bdcfb5811d6d7f7a2d969aa8f64f7

Timestamp:

01/11/05 12:39:49 (3 years ago)

Author:

Christophe Mutricy <xtophe@videolan.org>

git-committer:

Christophe Mutricy <xtophe@videolan.org> 1130845189 +0000

git-parent:

[0a5027d1cdcff19dbb5e8f8fc9e325fa47ed091b]

git-author:

Christophe Mutricy <xtophe@videolan.org> 1130845189 +0000

Message:

Don't put .zlib as requirement as it can came from the system

Files:

• extras/contrib/src/Makefile (modified) (3 diffs)

extras/contrib/src/Makefile

@@ -138 +138 @@
-   all: .iconv .intl .freetype .fribidi .zlib\
-    .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
-.dts
+
-    .live .goom2k4 .caca .mod .x264  .xml .twolame\
-    .png .gpg-error .gcrypt .gnutls \
-    .gnutls .dvdread .dvdnav .dvbpsi .wxwidgets .dirac \
-    .dx_headers .dshow_headers .aclocal .gecko-win32
-
+.dts
-   else
-# Standard Linux or other UNIX-like systems
@@ -810 +810 @@
-#   patch -p 0 < Patches/ffmpeg.patch
-
-.zlib
+
-    (cd $<; ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-mp3lame --enable-faac --enable-pp --disable-vhook --disable-audio-beos --disable-ffserver  --enable-a52 --disable-ffplay && for dir in libavcodec/libpostproc libavcodec libavformat libavutil; do make -C $$dir && make -C $$dir installlib; done)
-    touch $@
@@ -1286 +1286 @@
-    (cd $@; cat ../Patches/libpng-1.2.5-win32.patch | sed s,��PREFIX��,$(PREFIX), | patch -p0)
-endif
-.zlib
+
-ifdef HAVE_DARWIN_OS
-    (cd $<; cp scripts/makefile.macosx Makefile && make && make install)