Changeset 489c95cabeb65e9184174ae02af24c173997382b

Show
Ignore:
Timestamp:
11/09/08 20:09:06 (3 months ago)
Author:
Jean-Baptiste Kempf <jb@videolan.org>
git-committer:
Jean-Baptiste Kempf <jb@videolan.org> 1221156546 +0200
git-parent:

[5ecef9fc2f16566bd4268e56e531ac705174435f]

git-author:
Jean-Baptiste Kempf <jb@videolan.org> 1221156546 +0200
Message:

Contribs cleanup. Merging of configure flags when possible.

Please launch autotools ONLY after patch, not everytime your reconfigure.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extras/contrib/src/Makefile

    r5ecef9f r489c95c  
    370370    patch -d pkgconfig/glib-1.2.8 -p 1 < Patches/glib.patch 
    371371    patch -d pkgconfig -p0 < Patches/pkgcfg.patch 
     372    (cd $@; autoconf) 
    372373 
    373374.pkgcfg: pkgconfig 
    374     (cd pkgconfig; autoconf && ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install) 
     375    (cd pkgconfig; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install) 
    375376    touch $@ 
    376377 
    …… 
    468469    patch -p0 < Patches/fontconfig.patch 
    469470    patch -p0 < Patches/fontconfig-nodocs.patch 
     471    (cd $@; autoreconf) 
    470472 
    471473.fontconfig: fontconfig .xml .freetype 
    472474ifdef HAVE_WIN32 
    473475  ifdef HAVE_CYGWIN 
    474     (cd $<; autoreconf && LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure --target=$(HOST) --disable-pic --disable-shared --disable-docs --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --with-default-fonts=C:\\windows\fonts --with-add-fonts=C:\\winnt\fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install) 
     476    (cd $<; LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure --target=$(HOST) --disable-pic --disable-shared --disable-docs --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --with-default-fonts=C:\\windows\fonts --with-add-fonts=C:\\winnt\fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install) 
    475477  else 
    476     (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --with-default-fonts=C:\\windows\fonts --with-add-fonts=C:\\winnt\fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install) 
     478    (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --with-default-fonts=C:\\windows\fonts --with-add-fonts=C:\\winnt\fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install) 
    477479  endif 
    478480else 
    479481  ifdef HAVE_DARWIN_OS 
    480     (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`xml2-config --cflags` LIBXML2_LIBS=`xml2-config --libs` ./configure $(HOSTCONF) --with-cache-dir=/var/cache/fontconfig --with-default-fonts=/System/Library/Fonts --with-add-fonts=/Library/Fonts,~/Library/Fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install-exec && (cd fontconfig ; make install-data) && cp fontconfig.pc $(PKG_CONFIG_LIBDIR)) 
     482    (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`xml2-config --cflags` LIBXML2_LIBS=`xml2-config --libs` ./configure $(HOSTCONF) --with-cache-dir=/var/cache/fontconfig --with-default-fonts=/System/Library/Fonts --with-add-fonts=/Library/Fonts,~/Library/Fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install-exec && (cd fontconfig ; make install-data) && cp fontconfig.pc $(PKG_CONFIG_LIBDIR)) 
    481483  else 
    482     (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install) 
     484    (cd $<; $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install) 
    483485  endif 
    484486endif 
    …… 
    523525    $(EXTRACT_GZ) 
    524526    patch -p0 < Patches/fribidi.patch 
     527    ( cd $@; rm -f configure; ./bootstrap) 
    525528 
    526529.fribidi: fribidi .iconv 
    527     (cd $<; rm -f configure; ./bootstrap && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX)  && make && make install) 
     530    (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX)  && make && make install) 
    528531    $(INSTALL_NAME) 
    529532    touch $@ 
    …… 
    727730 
    728731.vorbis: libvorbis .ogg 
    729 # FIXME: shared libs disabled for now because of linking errors 
    730 #   -- titer 2005/09/16 
    731     (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared && make && make install) 
     732    (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) 
    732733#   $(INSTALL_NAME) 
    733734    touch $@ 
    …… 
    789790    (cd $@; autoconf) 
    790791 
     792THEORACONF = --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples 
     793 
    791794.theora: libtheora .ogg 
    792795ifdef HAVE_BEOS 
    793     (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm --disable-examples && make && make install) 
     796    (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) --disable-asm && make && make install) 
    794797else 
    795798  ifdef NO_TEXT_RELOCATION 
    796     (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm --disable-examples && make && make install) 
     799    (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm $(THEORACONF) && make && make install) 
    797800  else 
    798     (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples && make && make install) 
     801    (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF)&& make && make install) 
    799802  endif 
    800803endif 
    …… 
    11031106endif 
    11041107 
     1108 
     1109FFMPEGCONF = --enable-gpl --enable-postproc --disable-vhook --disable-ffserver --disable-ffmpeg --disable-ffplay --disable-devices --disable-protocols --disable-network --disable-filters 
     1110 
    11051111ifdef HAVE_WINCE 
    11061112.ffmpeg: ffmpeg .zlib 
    …… 
    11121118endif 
    11131119endif 
    1114  
    1115     (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-postproc --disable-vhook --disable-ffserver --disable-ffmpeg --disable-ffplay --disable-devices --disable-protocols --disable-network --disable-filters --disable-shared --enable-static && make && make install-libs install-headers) 
     1120    (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers) 
    11161121    touch $@ 
    11171122 
    …… 
    16611666    patch -p0 < Patches/xml2-win32.patch 
    16621667    rm -f xml/aclocal.m4 
     1668    (cd $@; aclocal && automake && autoreconf) 
    16631669endif 
    16641670ifdef HAVE_UCLIBC 
    …… 
    16661672endif 
    16671673 
     1674XMLCONF = --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp  --without-debug --without-docbook --without-regexps 
     1675 
    16681676.xml: xml 
    1669 ifdef HAVE_WIN32 
    1670     (cd xml; aclocal && automake && autoreconf) 
    1671 endif 
    16721677  ifdef HAVE_CYGWIN 
    1673     (cd xml; ac_cv_header_pthread_h="no" CFLAGS="-DLIBXML_STATIC" $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp  --without-debug --without-docbook --without-regexps && make && make install) 
     1678    (cd xml; ac_cv_header_pthread_h="no" CFLAGS="-DLIBXML_STATIC" $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(XMLCONF) && make && make install) 
    16741679  else 
    1675     (cd xml; CFLAGS="-DLIBXML_STATIC" $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp  --without-debug --without-docbook --without-regexps && make && make install) 
     1680    (cd xml; CFLAGS="-DLIBXML_STATIC" $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(XMLCONF) && make && make install) 
    16761681  endif 
    16771682ifndef HAVE_DARWIN_OS 
    …… 
    16961701    patch -p0 < Patches/twolame-BeOS.patch 
    16971702endif 
    1698  
    1699 .twolame: twolame 
    17001703ifdef HAVE_WIN32 
    17011704    (cd twolame/win32; $(WGET) "http://twolame.svn.sourceforge.net/viewvc/*checkout*/twolame/trunk/win32/winutil.h") 
    17021705endif    
     1706 
     1707.twolame: twolame 
    17031708    (cd twolame; $(HOSTCC) CFLAGS="${CFLAGS}  -DLIBTWOLAME_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX) && cd libtwolame &&  make && make install) 
    17041709    $(INSTALL_NAME) 
    …… 
    19171922    patch -p0 < Patches/gnutls-win32.patch 
    19181923    (cd $@; cd lgl; ln -sf alloca_.h alloca.h;) 
     1924    (cd $@; autoconf) 
    19191925endif 
    19201926 
    19211927.gnutls: gnutls .opencdk .gcrypt .gpg-error  
    19221928ifdef HAVE_WIN32 
    1923     (cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc --disable-cxx -disable-shared --enable-static --disable-nls   --with-included-opencdk --with-included-libtasn1 && cd lgl && make && cd ../gl && make &&  cd ../lib &&make && make install && cd ../includes && make install) 
     1929    (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc --disable-cxx -disable-shared --enable-static --disable-nls   --with-included-opencdk --with-included-libtasn1 && cd lgl && make && cd ../gl && make &&  cd ../lib &&make && make install && cd ../includes && make install) 
    19241930else 
    19251931    (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --disable-cxx --with-libopencdk-prefix=$(PREFIX) --disable-guile && make && make install) 
    …… 
    22602266    patch -p0 < Patches/clinkcc_osx.patch 
    22612267endif 
     2268    (cd $@; ./bootstrap) 
    22622269 
    22632270.clinkcc: clinkcc 
    2264     (cd $<; ./bootstrap && ./configure --prefix=$(PREFIX) --enable-expat && make && chmod 755 config/install-sh && make install ) 
     2271    (cd $<;./configure --prefix=$(PREFIX) --enable-expat && make && chmod 755 config/install-sh && make install ) 
    22652272    touch $@ 
    22662273