X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=39a289c314fb952d9e41b7ae2ff80763b3f9989c;hb=91ef82f27f57a462ba9698d18210bbf2f71163d4;hp=098828249e204005a5091151001118a7c5bbb57d;hpb=353bed9dbe3937b92cfcda31f092b1e334847f79;p=vlc diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 098828249e..39a289c314 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -1,14 +1,15 @@ # *************************************************************************** # src/Makefile : Dearchive and compile all files necessary # *************************************************************************** -# Copyright (C) 2003 - 2005 the VideoLAN team +# Copyright (C) 2003 - 2006 the VideoLAN team # $Id$ # # Authors: Christophe Massiot # Derk-Jan Hartman # Eric Petit -# Felix Kühne +# Felix Kühne # Christophe Mutricy +# Gildas Bazin # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -22,7 +23,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. # *************************************************************************** include ../config.mak @@ -32,29 +33,11 @@ include ./packages.mak # Set a clean environment # *************************************************************************** -ifdef HAVE_DARWIN_OS -export PATH = $(PREFIX)/bin:/bin:/usr/bin +export PATH := $(PREFIX)/bin:$(EXTRA_PATH):$(PATH) +export PKG_CONFIG_PATH export DYLD_LIBRARY_PATH = $(PREFIX)/lib -endif - -ifdef HAVE_BEOS -ifeq ($(HOST),$(BUILD)) -# Compiling on BeOS -export PATH = $(PREFIX)/bin:.:/boot/home/config/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:/boot/develop/tools/gnupro/bin -export LIBRARY_PATH = $(PREFIX)/lib:%A/lib:/boot/home/config/lib:/boot/beos/system/lib -else -# Cross compiling from Linux -export PATH = $(PREFIX)/bin:/opt/beos-tools/bin:/opt/cross-tools/bin:/usr/bin:/bin -endif -endif - -ifdef HAVE_WIN32 -export PATH := $(PREFIX)/bin:$(PATH) -export PKG_CONFIG_PATH = $(PREFIX)/lib/pkgconfig -#EXTRA_CPPFLAGS = /usr/win32/include -#EXTRA_LDFLAGS = /usr/win32/lib -endif - +export MACOSX_DEPLOYMENT_TARGET = $(SDK_TARGET) +export LIBRARY_PATH := $(PREFIX)/lib:$(LIBRARY_PATH) export CFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS) export CPPFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS) export CXXFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS) @@ -67,29 +50,66 @@ export LDFLAGS = -L$(PREFIX)/lib $(EXTRA_LDFLAGS) # way of doing it... ;) # *************************************************************************** +ifneq ($(CC),) +HOSTCC+= CC="$(CC)" +endif +ifneq ($(CXX),) +HOSTCC+= CXX="$(CXX)" +endif +ifneq ($(LD),) +HOSTCC+= LD="$(LD)" +endif +ifneq ($(RANLIB),) +HOSTCC+= RANLIB="$(RANLIB)" +endif +ifneq ($(AR),) +HOSTCC+= AR="$(AR)" +endif + +# Define ranlib on non-cross compilation setups +ifeq ($(RANLIB),) +RANLIB=ranlib +endif + +# For libebml/libmatroska. Grrr. +ifneq ($(AR),) +HOSTCC2=$(HOSTCC) AR="$(AR) rcvu" +else +HOSTCC2=$(HOSTCC) +endif + ifneq ($(BUILD),$(HOST)) # We are cross compiling -HOSTCONF=--host=$(HOST) --build=$(BUILD) -HOSTCC=CC=$(HOST)-gcc CXX=$(HOST)-g++ AR=$(HOST)-ar RANLIB=$(HOST)-ranlib -# For libebml/libmatroska. Grrr. -HOSTCC2=CC=$(HOST)-gcc CXX=$(HOST)-g++ AR="$(HOST)-ar rcvu" RANLIB=$(HOST)-ranlib +HOSTCONF=--host=$(HOST) --build=$(BUILD) FFMPEGCONF=--cross-prefix=$(HOST)- X264CONF=--crosscompile=$(HOST) -LIVECC=C_COMPILER=$(HOST)-gcc CPP=$(HOST)-cpp CPLUSPLUS_COMPILER=$(HOST)-g++ LINK="$(HOST)-g++ -o" LIBRARY_LINK="$(HOST)-ld -o" -RANLIB=$(HOST)-ranlib else -# Building natively -RANLIB=ranlib -endif -ifeq ($(HOST),i586-pc-beos) -FFMPEGCONF+=--cpu=x86 + ifneq ($(CC),) + FFMPEGCONF=--cc="$(CC)" + endif endif +# # Special target-dependant options -#win +# ifdef HAVE_WIN32 HOSTCONF+= --without-pic --disable-shared --enable-msw --with-included-opencdk --with-included-libtasn1 --disable-depedency-tracking -FFMPEGCONF+= --enable-mingw32 --enable-memalign-hack --cpu=x86 +FFMPEGCONF+= --enable-mingw32 --enable-memalign-hack --cpu=x86 --disable-debug +endif + +ifdef HAVE_WINCE +HOSTCONF+= --without-pic --disable-shared +FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-debug --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols +else +FFMPEGCONF+= --enable-mp3lame --enable-faac +endif + +ifdef HAVE_BEOS +FFMPEGCONF+= --cpu=x86 +endif + +ifeq ($(HOST),i686-apple-darwin8) +FFMPEGCONF += --enable-memalign-hack endif # *************************************************************************** @@ -97,53 +117,66 @@ endif # *************************************************************************** ifdef HAVE_DARWIN_OS - all: .autoconf .automake .libtool .iconv .intl .pkgcfg .freetype .fribidi \ - .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .x264 .theora \ - .FLAC .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg .openslp \ - .dvdcss .dvdread .dvdnav .dvbpsi .live .goom2k4 .caca .mod \ + all: .autoconf .automake .libtool .intl .pkgcfg .freetype .fribidi \ + .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \ + .FLAC .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \ + .dvdcss .dvdnav .dvdread .dvbpsi .live .x264 .caca .mod \ .png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \ - .glib .libidl .gecko .libmpcdec .expat .clinkcc .aclocal + .glib .libidl .gecko .mpcdec .expat .clinkcc .aclocal +# .FLAC .expat .clinkcc don't work with SDK yet +# .glib .libidl .gecko are required to build the mozilla plugin # .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package +ifneq ($(HOST),i686-apple-darwin8) +all: .goom2k4 +endif else - ifeq ($(HOST),i586-pc-beos) + ifdef HAVE_BEOS ifeq ($(HOST),$(BUILD)) # Native build: we need perl, autoconf, etc first all: .perl .autoconf .automake .libtool .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 + .dvdnav .dvbpsi .aclocal else # Cross compiling: we already have the Linux tools, only build the # libraries now 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 + .dvdnav .dvbpsi .aclocal endif else + ifdef HAVE_WIN32 all: .iconv .intl .freetype .fribidi .zlib \ .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \ .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \ .live .goom2k4 .caca .mod .x264 .xml .twolame \ - .png .gpg-error .gcrypt .gnutls .libmpcdec \ - .gnutls .dvdread .dvdnav .dvbpsi .wxwidgets .dirac \ + .png .gpg-error .gcrypt .gnutls .mpcdec \ + .gnutls .dvdnav .dvbpsi .wxwidgets .dirac \ .dx_headers .dshow_headers .aclocal .gecko-win32 -# .SDL_image .daap .cddb .cdio .vcdimager .dts .portaudio +# .SDL_image .daap .cddb .cdio .vcdimager .dts .portaudio + else + + ifdef HAVE_WINCE + + all: .dvbpsi .zlib .ffmpeg .ogg .tremor .faad else + # 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 \ .FLAC .speex .faad .faac .lame .ebml .dts .matroska .ffmpeg .dvdcss \ .live .goom2k4 .caca .mod .x264 .xml .twolame\ - .png .gpg-error .gcrypt .gnutls .libmpcdec\ - .gnutls .dvdread .dvdnav .dvbpsi .wxwidgets .dirac \ + .png .gpg-error .gcrypt .gnutls .mpcdec\ + .gnutls .dvdnav .dvbpsi .wxwidgets .dirac \ .aclocal # .SDL_image .daap .cddb .cdio .vcdimager + endif endif - endif + endif endif FORCE: @@ -220,8 +253,7 @@ perl-$(PERL_VERSION).tar.gz: perl: perl-$(PERL_VERSION).tar.gz $(EXTRACT_GZ) - mv perl/hints/beos.sh perl/hints/beos.sh.orig - sed 's%prefix="/boot/home/config"%prefix="$(PREFIX)"%' < perl/hints/beos.sh.orig > perl/hints/beos.sh + sed -i.orig 's%prefix="/boot/home/config"%prefix="$(PREFIX)"%' perl/hints/beos.sh .perl: perl (cd $<; ./Configure -d -e && make && make install && ln -sf perl5/$(PERL_VERSION)/BePC-beos/CORE/libperl.so $(PREFIX)/lib/libperl.so) @@ -257,6 +289,7 @@ DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.gz ifdef HAVE_DARWIN_OS .libtool: if test -x /usr/bin/glibtoolize; then \ + mkdir -p $(PREFIX)/bin ; \ ln -sf /usr/bin/glibtoolize $(PREFIX)/bin/libtoolize ; \ fi if test -f /usr/share/aclocal/libtool.m4; then \ @@ -310,6 +343,7 @@ pkgconfig-$(PKGCFG_VERSION).tar.gz: pkgconfig: pkgconfig-$(PKGCFG_VERSION).tar.gz $(EXTRACT_GZ) + patch -d pkgconfig/glib-1.2.8 -p 1 < Patches/glib.patch .pkgcfg: pkgconfig (cd pkgconfig; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install) @@ -328,20 +362,17 @@ gettext-$(GETTEXT_VERSION).tar.gz: gettext: gettext-$(GETTEXT_VERSION).tar.gz $(EXTRACT_GZ) -ifdef HAVE_DARWIN_OS - patch -p 0 < Patches/gettext-osx.patch -endif .intl: gettext .iconv ifdef HAVE_WIN32 - ( cd $< && ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-relocatable --with-iconv-prefix=$(PREFIX)) + ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-relocatable --with-iconv-prefix=$(PREFIX)) else - ( cd $< && ./configure $(HOSTCONF) --prefix=$(PREFIX) ) + ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) ) endif ifeq ($(BUILD),i586-pc-beos) # The ugliest kludge ever - so libtool correctly links shared libraries # on BeOS. Sorry, I just can't figure out how libtool works - ( cd $< && for f in `find . -name libtool`; do mv $$f $$f.orig; sed -e 's/ -shared / -nostart /' -e 's/^predep_objects.*/predep_objects=""/' < $$f.orig > $$f; chmod +x $$f; rm $$f.orig; done ) + ( cd $< && for f in `find . -name libtool`; do sed -e 's/ -shared / -nostart /' -e 's/^predep_objects.*/predep_objects=""/' -i $$f; chmod +x $$f; done ) endif ifneq ($(HOST),$(BUILD)) # We'll use the installed gettext and only need to cross-compile libintl @@ -352,7 +383,7 @@ else endif # Work around another non-sense of autoconf. ifdef HAVE_WIN32 - (cd ../include; sed -i.bak '283 c #if !1' libintl.h) + (cd ../include; sed -i.orig '283 c #if !1' libintl.h) endif $(INSTALL_NAME) touch $@ @@ -374,14 +405,15 @@ ifdef HAVE_DARWIN_OS patch -p 0 < Patches/libiconv.patch endif -.iconv: libiconv ifdef HAVE_DARWIN_OS - (cd libiconv; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install) +.iconv: + touch $@ else - (cd libiconv; CPPFLAGS="-Dssize_t=long" ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install) -endif +.iconv: libiconv + (cd libiconv; CPPFLAGS="-Dssize_t=long" $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install) $(INSTALL_NAME) touch $@ +endif CLEAN_FILE += .iconv CLEAN_PKG += libiconv @@ -398,7 +430,7 @@ freetype2: freetype-$(FREETYPE2_VERSION).tar.gz $(EXTRACT_GZ) .freetype: freetype2 - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) $(INSTALL_NAME) touch $@ @@ -420,7 +452,7 @@ ifdef HAVE_WIN32 patch -p 0 " > ogg.h && rm -f os_types.h && echo "#include " > os_types.h && ./autogen.sh) +else +tremor-$(TREMOR_VERSION).tar.bz2: + $(WGET) $(TREMOR_URL) + +tremor: tremor-$(TREMOR_VERSION).tar.bz2 + $(EXTRACT_BZ2) +endif + +.tremor: tremor .ogg + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared && make && make install) + $(INSTALL_NAME) + touch $@ + +CLEAN_FILE += .tremor +CLEAN_PKG += tremor +DISTCLEAN_PKG += tremor-$(TREMOR_VERSION).tar.gz + # *************************************************************************** # theora # *************************************************************************** @@ -586,9 +648,10 @@ libtheora-$(THEORA_VERSION).tar.bz2: libtheora: libtheora-$(THEORA_VERSION).tar.bz2 $(EXTRACT_BZ2) patch -p0 < Patches/theora.patch + (cd $@; autoconf) .theora: libtheora .ogg - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest && make && make install) $(INSTALL_NAME) touch $@ @@ -607,7 +670,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz $(EXTRACT_GZ) .shout: libshout .theora .ogg - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) $(INSTALL_NAME) touch $@ @@ -624,15 +687,18 @@ flac-$(FLAC_VERSION).tar.gz: flac: flac-$(FLAC_VERSION).tar.gz $(EXTRACT_GZ) +ifdef HAVE_DARWIN_OS + patch -p 0 < Patches/flac-mactel.patch +endif ifneq ($(HOST),$(BUILD)) (patch -p 0 < Patches/flac-cross.patch && cd $@ && autoconf) endif .FLAC: flac ifdef HAVE_WIN32 - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest --disable-asm-optimizations && cd src&& make -C libFLAC&& make -C libFLAC install && cd .. && make -C include install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest --disable-asm-optimizations && cd src&& make -C libFLAC&& make -C libFLAC install && cd .. && make -C include install) else - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && cd src&& make -C libFLAC&& make -C libFLAC install && cd .. && make -C include install) + (cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && cd src&& make -C libFLAC&& make -C libFLAC install && cd .. && make -C include install) endif $(INSTALL_NAME) touch $@ @@ -653,7 +719,7 @@ speex: speex-$(SPEEX_VERSION).tar.gz patch -p0 < Patches/speex.patch .speex: speex - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-ogg=no && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-ogg=no && make && make install) $(INSTALL_NAME) touch $@ @@ -677,12 +743,11 @@ faad2-$(FAAD2_VERSION).tar.bz2: faad2: faad2-$(FAAD2_VERSION).tar.bz2 $(EXTRACT_BZ2) -ifdef HAVE_WIN32 - (cd faad2;patch -p 0 < ../Patches/faad2-20050513-win32.patch && ./bootstrap) -endif + (cd $@; patch -p 0 < ../Patches/faad2.patch && ./bootstrap) + .faad: faad2 - (cd $< && ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && make -C libfaad && make -C libfaad install) -ifndef HAVE_DARWIN + (cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && make -C libfaad && make -C libfaad install) +ifndef HAVE_DARWIN_OS $(INSTALL_NAME) endif touch $@ @@ -703,7 +768,7 @@ faac: faac-$(FAAC_VERSION).tar.bz2 patch -p 0 < Patches/faac.patch .faac: faac - (cd $<; rm -f install-sh mkinstalldirs missing && ./bootstrap && ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared && make && make install) + (cd $<; rm -f install-sh mkinstalldirs missing && ./bootstrap && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared && make && make install) touch $@ CLEAN_FILE += .faac @@ -721,7 +786,7 @@ lame: lame-$(LAME_VERSION).tar.gz $(EXTRACT_GZ) .lame: lame - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-analyser-hooks --disable-decoder --disable-shared --disable-gtktest --disable-frontend && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-analyser-hooks --disable-decoder --disable-shared --disable-gtktest --disable-frontend && make && make install) touch $@ CLEAN_FILE += .lame @@ -779,7 +844,7 @@ endif .matroska: libmatroska .ebml ifdef HAVE_WIN32 - (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC2) CPPFLAGS=$(CFLAGS) libmatroska.a && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC2)) + (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC2) SHARED=no EBML_DLL=no libmatroska.a && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC2)) else (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX)) $(RANLIB) $(PREFIX)/lib/libmatroska.a @@ -797,16 +862,17 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 ffmpeg: echo $(FFMPEG_CVSROOT) A > ./ffmpeg.cvs CVS_PASSFILE=./ffmpeg.cvs cvs -z3 -d $(FFMPEG_CVSROOT) co ffmpeg - (cd $@;patch -p 0 <../Patches/ffmpeg-cvs.patch) ifeq ($(HOST),i586-pc-beos) - patch -p 0 < Patches/ffmpeg-beos.patch.cvs - (cd $@; ./bootstrap) + (cd $@; patch -p 0 < ../Patches/ffmpeg-cvs-beos.patch) endif ifdef HAVE_WIN32 patch -p 0 < Patches/ffmpeg-cvs-win32.patch endif -ifdef HAVE_DARWIN_OS - patch -p 0 < Patches/ffmpeg-cvs-osx.patch +ifdef HAVE_WINCE + patch -p 1 < Patches/ffmpeg-cvs-wince.patch +endif +ifeq ($(HOST),i686-apple-darwin8) + (cd $@;patch -p 0 < ../Patches/ffmpeg-cvs-mactel.patch) endif ffmpeg-$(FFMPEG_VERSION).tar.gz: @@ -816,33 +882,18 @@ ffmpeg-$(FFMPEG_VERSION).tar.gz: # $(EXTRACT_GZ) # patch -p 0 < Patches/ffmpeg.patch -.ffmpeg: ffmpeg .faac .lame - (cd $<; ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-mp3lame --enable-faac --enable-pp --disable-vhook --disable-ffserver --enable-a52 --disable-ffplay && for dir in libavcodec/libpostproc libavcodec libavformat libavutil; do make -C $$dir && make -C $$dir installlib; done) +ifdef HAVE_WINCE +.ffmpeg: ffmpeg .zlib +else +.ffmpeg: ffmpeg .faac .lame +endif + (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-network --enable-a52 --disable-ffplay && make install-libs install-headers) touch $@ CLEAN_FILE += .ffmpeg CLEAN_PKG += ffmpeg ffmpeg.cvs DISTCLEAN_PKG += ffmpeg-$(FFMPEG_VERSION).tar.gz -# *************************************************************************** -# openslp -# *************************************************************************** - -openslp-$(OPENSLP_VERSION).tar.gz: - $(WGET) $(OPENSLP_URL) - -openslp: openslp-$(OPENSLP_VERSION).tar.gz - $(EXTRACT_GZ) - patch -p 0 < Patches/openslp.patch - -.openslp: openslp - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make SUBDIRS="common libslpattr slpd libslp slptool" && make install SUBDIRS="common libslpattr slpd libslp slptool") - touch $@ - -CLEAN_FILE += .openslp -CLEAN_PKG += openslp -DISTCLEAN_PKG += openslp-$(OPENSLP_VERSION).tar.gz - # *************************************************************************** # libdvdcss # *************************************************************************** @@ -860,7 +911,7 @@ libdvdcss: libdvdcss-$(LIBDVDCSS_VERSION).tar.gz endif .dvdcss: libdvdcss - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) $(INSTALL_NAME) touch $@ @@ -869,33 +920,42 @@ CLEAN_PKG += libdvdcss DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz # *************************************************************************** -# libdvdread +# libdvdread: We use dvdnav's dvdread # *************************************************************************** -libdvdread-$(LIBDVDREAD_VERSION).tar.bz2: - $(WGET) $(LIBDVDREAD_URL) +#libdvdread-$(LIBDVDREAD_VERSION).tar.bz2: +# $(WGET) $(LIBDVDREAD_URL) -libdvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 - $(EXTRACT_BZ2) - patch -p 0 < Patches/libdvdread.patch -ifdef HAVE_WIN32 - if automake-1.4 --version >/dev/null 2>&1; then \ - echo "Please get rid of your automake 1.4"; \ - rm -rf $@ \ - exit 1; \ - fi - (cd libdvdread;patch -p 0 < ../Patches/libdvdread-20041028-win32.patch; ./bootstrap) -endif +#libdvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 +# $(EXTRACT_BZ2) +# patch -p 0 < Patches/libdvdread.patch +#ifdef HAVE_WIN32 +# if automake-1.4 --version >/dev/null 2>&1; then \ +# echo "Please get rid of your automake 1.4"; \ +# rm -rf $@ \ +# exit 1; \ +# fi +# (cd libdvdread; patch -p 0 < ../Patches/libdvdread-20041028-win32.patch; ./bootstrap) +#endif -.dvdread: libdvdread .dvdcss - (cd libdvdread; ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) && make && make install) +#.dvdread: libdvdread .dvdcss +# (cd libdvdread; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) && make && make install) +# $(INSTALL_NAME) +# touch $@ + +#CLEAN_FILE += .dvdread +#CLEAN_PKG += libdvdread +#DISTCLEAN_PKG += libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 + +# *************************************************************************** +# dummy dvdread to trigger the INSTALL_NAME script +# *************************************************************************** +.dvdread: .dvdnav $(INSTALL_NAME) + (install_name_tool -change $(PREFIX)/lib/libdvdread.0.dylib @executable_path/lib/vlc_libdvdread.dylib $(PREFIX)/vlc-lib/libdvdnav.dylib) touch $@ - CLEAN_FILE += .dvdread -CLEAN_PKG += libdvdread -DISTCLEAN_PKG += libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 # *************************************************************************** # libdvdnav @@ -906,18 +966,15 @@ libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2: libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 $(EXTRACT_BZ2) -ifdef HAVE_WIN32 - (cd $@; patch -p 0 < ../Patches/libdvdnav-20050211-win32.patch) -else patch -p 0 < Patches/dvdnav.patch -endif + patch -p 0 < Patches/libdvdnav-mactel.patch (cd $@; ./autogen.sh noconfig) -.dvdnav: libdvdnav .dvdread +.dvdnav: libdvdnav .dvdcss ifdef HAVE_WIN32 - (cd $<; ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) --disable-builtin-dvdread CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -DNDEBUG -Dssize_t=long" && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -Dssize_t=long" && make && make install) else - (cd $<; ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) CFLAGS="$(CFLAGS) -Dlseek64=lseek -Doff64_t=off_t" && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) CFLAGS="$(CFLAGS) -Dlseek64=lseek -Doff64_t=off_t" && make && make install) endif $(INSTALL_NAME) touch $@ @@ -937,7 +994,7 @@ libdvbpsi: libdvbpsi3-$(LIBDVBPSI_VERSION).tar.gz $(EXTRACT_GZ) .dvbpsi: libdvbpsi - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && cd src && make && make install) $(INSTALL_NAME) touch $@ @@ -956,16 +1013,19 @@ live: live555-$(LIVEDOTCOM_VERSION).tar.gz $(EXTRACT_GZ) patch -p 0 < Patches/live.patch patch -p 0 < Patches/livedotcom-win32.patch - patch -p 0 < Patches/livedotcom-osx.patch + patch -p 0 < Patches/live-osx.patch .live: live -ifeq ($(HOST),ppc-darwin) - (cd $<; ./genMakefiles macosx-before-version-10.4 && make ) +ifeq ($(HOST),powerpc-apple-darwin8) + (cd $<; sed -e 's%EXTRA_CFLAGS%$(EXTRA_CFLAGS)%' -e 's%EXTRA_LDFLAGS%$(EXTRA_LDFLAGS)%' -i.orig config.macosx) + (cd $<; ./genMakefiles macosx && make) else -ifdef HAVE_WIN32 - (cd $<;./genMakefiles mingw && make) +ifeq ($(HOST),powerpc-apple-darwin*) + (cd $<; ./genMakefiles macosx-before-version-10.4 && make ) +elif defined( HAVE_WIN32 ) + (cd $<;./genMakefiles mingw && make $(HOSTCC)) else - (cd $<; ./genMakefiles macosx && make ) + (cd $<;./genMakefiles linux && make ) endif endif touch $@ @@ -1006,6 +1066,7 @@ ifdef HAVE_DARWIN_OS patch -p 0 < Patches/goom.patch endif ifdef HAVE_WIN32 + (cd $@; dos2unix configure.in) patch -p 0 |configure &&./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install) + (cd $< && rm -f configure; autoconf configure.in > configure && $(HOSTCC) sh ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install) endif touch $@ @@ -1032,7 +1093,11 @@ libcaca: libcaca-$(LIBCACA_VERSION).tar.gz $(EXTRACT_GZ) .caca: libcaca - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-imlib2 --disable-doc && make && make install) +ifdef HAVE_WIN32 + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-win32 --disable-x11 --disable-imlib2 --disable-doc && make && make install) +else + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-imlib2 --disable-doc && make && make install) +endif touch $@ CLEAN_FILE += .caca @@ -1049,7 +1114,7 @@ libdts-$(LIBDTS_VERSION).tar.gz: ifeq ($(HOST),i586-pc-beos) # libdts 0.0.2 doesn't compile on BeOS libdts: - svn co svn://svn.videolan.org/libdts/trunk libdts + $(SVN) co svn://svn.videolan.org/libdts/trunk libdts (cd $@; ./bootstrap) else libdts: libdts-$(LIBDTS_VERSION).tar.gz @@ -1057,7 +1122,7 @@ libdts: libdts-$(LIBDTS_VERSION).tar.gz endif .dts: libdts - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) touch $@ CLEAN_FILE += .dts @@ -1072,9 +1137,9 @@ ifdef SVN x264: $(SVN) co svn://svn.videolan.org/x264/trunk/ x264 ifdef HAVE_WIN32 - (cd x264; patch -p 0 <../Patches/x264-svn-win32.patch ) + (cd x264; patch -p 0 < ../Patches/x264-svn-win32.patch ) else - cd x264 && patch -p 0 < ../Patches/x264_svn.patch + patch -p 0 < Patches/x264_svn.patch rm x264/x264.c endif else @@ -1091,8 +1156,12 @@ else endif endif +ifeq ($(HOST),i686-apple-darwin8) +.x264: x264 .nasm +else .x264: x264 - (cd $<; ./configure $(X264CONF) --prefix=$(PREFIX) && make && make install) +endif + (cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install) touch $@ CLEAN_FILE += .x264 @@ -1110,7 +1179,7 @@ libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz $(EXTRACT_GZ) .mod: libmodplug - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static && make && make install) touch $@ CLEAN_FILE += .mod @@ -1121,15 +1190,14 @@ DISTCLEAN_PKG += libmodplug-$(MODPLUG_VERSION).tar.gz # libcddb # *************************************************************************** -libcddb-$(CDDB_VERSION).tar.gz: +libcddb-$(CDDB_VERSION).tar.bz2: $(WGET) $(CDDB_URL) -libcddb: libcddb-$(CDDB_VERSION).tar.gz - $(EXTRACT_GZ) - patch -p 0 < Patches/libcddb.patch +libcddb: libcddb-$(CDDB_VERSION).tar.bz2 + $(EXTRACT_BZ2) .cddb: libcddb - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" LDFLAGS="$(LDFLAGS) -liconv" && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" LDFLAGS="$(LDFLAGS) -liconv" && make && make install) touch $@ CLEAN_FILE += .cddb @@ -1208,7 +1276,7 @@ wxwidgets: wxWidgets-$(WXWIDGETS_VERSION).tar.gz # (cd wxwidgets; patch -p1 <../Patches/wxMSW-win32.patch) .wxwidgets: wxwidgets - (cd wxwidgets; ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-optimise --disable-debug --disable-threads --disable-gif --disable-pcx --disable-iff --disable-pnm --without-zlib --without-libpng --without-libjpeg --without-libtiff --without-regex --disable-zipstream --disable-fs_zip --enable-no_rtti --enable-no_exceptions --disable-exceptions --disable-stl --disable-html --without-expat --disable-protocols --disable-protocol --disable-xrc --disable-sound --disable-dialupman --disable-mediactrl --disable-joystick --disable-grid --disable-datepick --disable-postscript--disable-filesystem --disable-fileproto --disable-ipc --disable-sockets && make && make install) + (cd wxwidgets; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-optimise --disable-debug --disable-threads --disable-gif --disable-pcx --disable-iff --disable-pnm --without-zlib --without-libpng --without-libjpeg --without-libtiff --without-regex --disable-zipstream --disable-fs_zip --enable-no_rtti --enable-no_exceptions --disable-exceptions --disable-stl --disable-html --without-expat --disable-protocols --disable-protocol --disable-xrc --disable-sound --disable-dialupman --disable-mediactrl --disable-joystick --disable-grid --disable-datepick --disable-postscript--disable-filesystem --disable-fileproto --disable-ipc --disable-sockets --disable-precomp-headers && make && make install) $(INSTALL_NAME) touch $@ @@ -1225,9 +1293,10 @@ zlib-$(ZLIB_VERSION).tar.gz: zlib: zlib-$(ZLIB_VERSION).tar.gz $(EXTRACT_GZ) + patch -p 0 < Patches/zlib.patch .zlib: zlib - (cd zlib; $(HOSTCC2) ./configure --prefix=$(PREFIX) && make && make install) + (cd zlib; $(HOSTCC2) ./configure --prefix=$(PREFIX) && make install) $(INSTALL_NAME) touch $@ @@ -1245,9 +1314,12 @@ pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz: portaudio: pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz $(EXTRACT_GZ) +ifneq ($(HOST),$(BUILD)) + (patch -p 0 < Patches/portaudio-cross.patch;cd $@; autoconf) +endif .portaudio: portaudio - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) $(INSTALL_NAME) touch $@ @@ -1271,7 +1343,7 @@ ifdef HAVE_WIN32 endif .xml: xml - (cd xml; ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-writer --with-output --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp && make && make install) + (cd xml; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-writer --with-output --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp && make && make install) ifndef HAVE_DARWIN_OS $(INSTALL_NAME) endif @@ -1293,7 +1365,7 @@ twolame: twolame-$(TWOLAME_VERSION).tar.gz $(EXTRACT_GZ) .twolame: twolame - (cd twolame; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) + (cd twolame; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) $(INSTALL_NAME) touch $@ @@ -1310,18 +1382,20 @@ libpng-$(PNG_VERSION).tar.bz2: libpng: libpng-$(PNG_VERSION).tar.bz2 $(EXTRACT_BZ2) - cat Patches/libpng.patch | sed s,PREFIX,$(PREFIX), | patch -p0 ifdef HAVE_WIN32 - (cd $@; cat ../Patches/libpng-1.2.5-win32.patch | sed s,££PREFIX££,$(PREFIX), | patch -p0) + (cd $@; cat ../Patches/libpng-1.2.5-win32.patch | sed s,??PREFIX??,$(PREFIX), | patch -p0) +else + (cat Patches/libpng-osx.patch | sed -e 's%??PREFIX??%$(PREFIX)%' -e 's%??EXTRA_CFLAGS??%$(EXTRA_CFLAGS)%' -e 's%??EXTRA_LDFLAGS??%$(EXTRA_LDFLAGS)%' | patch -p0) endif + .png: libpng ifdef HAVE_DARWIN_OS (cd $<; cp scripts/makefile.macosx Makefile && make && make install) else ifdef HAVE_WIN32 - (cd $<; cp scripts/makefile.cygwin Makefile && make && make install) + (cd $<; rm -f INSTALL; cp scripts/makefile.cygwin Makefile && make $(HOSTCC) && make install-static) else - (cd $<;./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) endif $(INSTALL_NAME) endif @@ -1360,7 +1434,7 @@ libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.gz $(EXTRACT_GZ) .gpg-error: libgpg-error - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install) + (cd $<; ./autogen.sh && libtoolize --force && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install) $(INSTALL_NAME) touch $@ @@ -1377,11 +1451,14 @@ libgcrypt-$(GCRYPT_VERSION).tar.bz2: libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 $(EXTRACT_BZ2) -# patch -p 0 < Patches/gcrypt.patch + patch -p 0 < Patches/gcrypt.patch .gcrypt: libgcrypt .gpg-error - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install) -# (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make && make install) +ifdef HAVE_WIN32 + (cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install) +else + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install) +endif $(INSTALL_NAME) touch $@ @@ -1401,11 +1478,11 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2 (cd gnutls/gl ;ln -s alloca_.h alloca.h) .gnutls: gnutls .gcrypt .gpg-error -#ifdef HAVE_WIN32 - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && cd crypto && make && cd ../gl && make && cd ../lib &&make && make install && cd ../includes && make install) -#else -# (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && cd lib &&make && make install) -#endif +ifdef HAVE_WIN32 + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc && cd gl && make && cd ../lib &&make && make install && cd ../includes && make install) +else + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && cd crypto && make && cd ../gl && make && cd ../lib &&make && make install && cd ../includes && make install) +endif $(INSTALL_NAME) touch $@ @@ -1442,6 +1519,7 @@ glib-$(GLIB_VERSION).tar.gz: glib: glib-$(GLIB_VERSION).tar.gz $(EXTRACT_GZ) + patch -p 0 < Patches/glib.patch .glib: glib (cd $<; ./configure --prefix=$(PREFIX) --host=powerpc-apple-macos && make && make install) @@ -1547,7 +1625,7 @@ jpeg: jpeg-$(JPEG_VERSION).tar.gz $(EXTRACT_GZ) .jpeg: jpeg - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(HOSTCC) && make && make install-lib) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(HOSTCC) && make && make install-lib) $(RANLIB) $(PREFIX)/lib/libjpeg.a touch $@ @@ -1594,7 +1672,7 @@ SDL: SDL-$(SDL_VERSION).tar.gz patch -p 0 < Patches/SDL.patch .SDL: SDL - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-audio --disable-video-x11 --disable-video-aalib --disable-video-dga --disable-video-fbcon --disable-video-directfb --disable-video-ggi --disable-video-svga --disable-directx --disable-joystick --disable-cdrom --disable-threads --disable-sdl-dlopen CFLAGS="$(CFLAGS)" && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-audio --disable-video-x11 --disable-video-aalib --disable-video-dga --disable-video-fbcon --disable-video-directfb --disable-video-ggi --disable-video-svga --disable-directx --disable-joystick --disable-cdrom --disable-threads --disable-sdl-dlopen CFLAGS="$(CFLAGS)" && make && make install) $(INSTALL_NAME) touch $@ @@ -1614,7 +1692,7 @@ SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz patch -p 0 < Patches/SDL_image.patch .SDL_image: SDL_image .SDL .png .jpeg .tiff - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-tif CFLAGS="$(CFLAGS)" && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-tif CFLAGS="$(CFLAGS)" && make && make install) $(INSTALL_NAME) touch $@ @@ -1629,23 +1707,26 @@ DISTCLEAN_PKG += SDL_image-$(SDL_IMAGE_VERSION).tar.gz libmpcdec-$(MUSE_VERSION).tar.bz2: $(WGET) $(MUSE_URL) -libmpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2 +mpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2 $(EXTRACT_BZ2) - patch -p 0 < Patches/libmpcdec.patch + patch -p 0 < Patches/mpcdec.patch ifdef HAVE_WIN32 (cd $@; ./autogen.sh) endif -.libmpcdec: libmpcdec +.mpcdec: mpcdec ifdef HAVE_WIN32 - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS=-D_PTRDIFF_T=mpc_int32_t && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS=-D_PTRDIFF_T=mpc_int32_t && make && make install) else - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) +endif +ifdef HAVE_DARWIN_OS + $(INSTALL_NAME) endif touch $@ -CLEAN_FILE += .libmpcdec -CLEAN_PKG += libmpcdec +CLEAN_FILE += .mpcdec +CLEAN_PKG += mpcdec DISTCLEAN_PKG += libmpcdec-$(MUSE_VERSION).tar.bz2 # *************************************************************************** @@ -1663,7 +1744,7 @@ ifneq ($(HOST),$(BUILD)) endif .dirac: dirac - (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && DOC_DIR="" make && DOC_DIR="" make install) + (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && DOC_DIR="" make && DOC_DIR="" make install) $(INSTALL_NAME) touch $@ @@ -1735,6 +1816,29 @@ CLEAN_FILE += .clinkcc CLEAN_PKG += clinkcc DISTCLEAN_PKG += clinkcc-$(CLINKCC_VERSION).tar.gz +# *************************************************************************** +# NASM assembler +# *************************************************************************** + +nasm-$(NASM_VERSION).tar.bz2: + $(WGET) $(NASM_URL) + +nasm: nasm-$(NASM_VERSION).tar.bz2 + $(EXTRACT_BZ2) + +#nasm: +# echo $(NASM_CVSROOT) A > ./nasm.cvs +# CVS_PASSFILE=./nasm.cvs cvs -z3 -d $(NASM_CVSROOT) co nasm +# (cd $@ && autoconf && autoheader) + +.nasm: nasm + (cd $< && $(HOSTCC) ./configure --prefix=$(PREFIX) && make && make install) + touch $@ + +CLEAN_FILE += .nasm +CLEAN_PKG += nasm nasm.cvs +DISTCLEAN_PKG += nasm-$(NASM_VERSION).tar.bz2 + # *************************************************************************** # Copy aclocal files # This is necessary for --missing aclocal to succeed after a