oops, tab expansion is a bad thing on Makefile

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index b76fe5f16d87cae60686673c8109ffef8925b482..6ee99c8aef41e8332478e978c1a0bc263dde8891 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -91,16 +91,16 @@ endif
 #
 # cross compiling
 #
+HOSTCONF=--target=$(HOST) --host=$(HOST) --build=$(BUILD)
 ifneq ($(BUILD),$(HOST))
     #
     # Compiling for MinGW under Cygwin could be deemed as cross compiling
     # unfortunately there isn't a complete separate GCC toolchain for MinGW under Cygwin
     #
-    HOSTCONF=--host=$(HOST) --build=$(BUILD)
     ifeq ($(findstring cygwin,$(BUILD)),)
-       # We are REALLY cross compiling
-       FFMPEGCONF=--cross-prefix=$(HOST)-
-       X264CONF=--crosscompile=$(HOST)
+        # We are REALLY cross compiling
+        FFMPEGCONF=--cross-prefix=$(HOST)-
+        X264CONF=--crosscompile=$(HOST)
     endif
 endif
 
@@ -172,7 +172,7 @@ else
 
   ifdef HAVE_WIN32
 
-   all: .iconv .intl .pkgcfg .freetype .fribidi .zlib \
+   all: .iconv .intl .freetype .fribidi .zlib \
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .shout .vorbisenc .theora \
        .FLAC .speex .faad .faac .lame .ebml  .matroska .ffmpeg .dvdcss \
        .live .goom2k4 .caca .mod .x264  .xml .twolame \
@@ -381,15 +381,16 @@ DISTCLEAN_PKG += automake-$(AUTOMAKE_VERSION).tar.gz
 # pkgconfig
 # ***************************************************************************
 
-pkgconfig-$(PKGCFG_VERSION).tar.gz:
+pkg-config-$(PKGCFG_VERSION).tar.gz:
        $(WGET) $(PKGCFG_URL)
 
-pkgconfig: pkgconfig-$(PKGCFG_VERSION).tar.gz
+pkgconfig: pkg-config-$(PKGCFG_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -d pkgconfig/glib-1.2.8 -p 1 < Patches/glib.patch
+       patch -d pkgconfig -p0 < Patches/pkgcfg.patch
 
 .pkgcfg: pkgconfig
-       (cd pkgconfig; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
+       (cd pkgconfig; autoconf && ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
        touch $@
 
 CLEAN_FILE += .pkgcfg
@@ -406,15 +407,14 @@ gettext-$(GETTEXT_VERSION).tar.gz:
 gettext: gettext-$(GETTEXT_VERSION).tar.gz
        $(EXTRACT_GZ)
 ifdef HAVE_DARWIN_OS
-       (cd $@; ./autogen.sh)
        patch -p 0 < Patches/gettext-macosx.patch 
 endif
 
 .intl: gettext .iconv
 ifdef HAVE_WIN32
-       ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-relocatable --with-iconv-prefix=$(PREFIX))
+       ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-relocatable --with-iconv-prefix=$(PREFIX) --disable-java --disable-native-java)
 else
-       ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) )
+       ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-java --disable-native-java)
 endif
 ifeq ($(BUILD),i586-pc-beos)
 # The ugliest kludge ever - so libtool correctly links shared libraries
@@ -929,6 +929,9 @@ endif
 ifdef HAVE_WINCE
        patch -p 1 < Patches/ffmpeg-svn-wince.patch
 endif
+ifdef HAVE_WIN32
+       (cd $@; patch -p 0 < ../Patches/ffmpeg-alignment.patch)
+endif
 
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
        $(WGET) $(FFMPEG_URL)
@@ -942,7 +945,7 @@ ifdef HAVE_WINCE
 else
 .ffmpeg: ffmpeg .faac .lame
 endif
-       (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_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)
+       (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-network --enable-a52 --disable-ffplay --enable-swscaler && make install-libs install-headers)
        touch $@
 
 CLEAN_FILE += .ffmpeg
@@ -1324,7 +1327,7 @@ wxwidgets: wxWidgets-$(WXWIDGETS_VERSION).tar.gz
 #      (cd wxwidgets; patch -p1 <../Patches/wxMSW-win32.patch)
 
 .wxwidgets: wxwidgets
-       (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)
+       (cd wxwidgets; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-optimise --disable-debug --enable-unicode --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 $@