From: Rémi Duraffort <ivoire@videolan.org>
Date: Mon, 23 Mar 2009 14:55:56 +0000 (+0100)
Subject: typo (and remove trailing spaces).
X-Git-Tag: 1.0.0-pre2~412
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f5a95b3b5232207ec1ebcd19fea734bc59bcd3cd;hp=1ab65a99ecfcb48b4f4b8e49489c335f1385eead;p=vlc

typo (and remove trailing spaces).
---

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index adfd3050c5..857b08ec47 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -163,7 +163,7 @@ DATE=`date +%Y-%m-%d`
 # Standard rules
 # ***************************************************************************
 # Generated by ./bootstrap from default configuration in src/Distributions
-# 
+#
 include ../distro.mak
 
 FORCE:
@@ -174,14 +174,14 @@ FORCE:
 
 define EXTRACT_GZ
 	rm -rf $@ || true
-	gunzip -c $< | tar xf - --exclude='[*?:<>\|]' 
+	gunzip -c $< | tar xf - --exclude='[*?:<>\|]'
 	mv $(patsubst %.tar.gz,%,$(patsubst %.tgz,%,$(notdir $<))) $@ || true
 	touch $@
 endef
 
 define EXTRACT_BZ2
 	rm -rf $@ || true
-	bunzip2 -c $< | tar xf - --exclude='[*?:<>\|]' 
+	bunzip2 -c $< | tar xf - --exclude='[*?:<>\|]'
 	mv $(patsubst %.tar.bz2,%,$(notdir $<)) $@ || true
 	touch $@
 endef
@@ -286,7 +286,7 @@ cmake-$(CMAKE_VERSION).tar.gz:
 
 cmake: cmake-$(CMAKE_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	
+
 #cmake:
 #	cvs -d :pserver:anonymous:cmake@www.cmake.org:/cvsroot/CMake co -d cmake CMake
 
@@ -651,7 +651,7 @@ ifdef HAVE_WIN32
 	( cd $<; sed -i.orig 's/lua luac/lua.exe/' Makefile ; cd src; sed -i.orig 's/CC=/#CC=/' Makefile; cd ../..;)
 	(cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM); cd src; $(HOSTCC) make liblua.a; cd ..;$(HOSTCC) make install INSTALL_TOP=$(PREFIX); $(RANLIB) $(PREFIX)/lib/liblua.a)
 	(cd $<; sed -i.orig 's@prefix= /usr/local@prefix= $(PREFIX)@' etc/lua.pc; mkdir -p $(PREFIX)/lib/pkgconfig; cp etc/lua.pc $(PREFIX)/lib/pkgconfig)
-else 
+else
 	(cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM) && make install INSTALL_TOP=$(PREFIX))
 endif
 	touch $@
@@ -743,7 +743,7 @@ DISTCLEAN_PKG += libvorbis-$(VORBIS_VERSION).tar.gz
 # ***************************************************************************
 
 ifdef SVN
-tremor: 
+tremor:
 	$(SVN) co http://svn.xiph.org/trunk/Tremor tremor
 	(cd $@ && patch -p0 < ../Patches/tremor.patch)
 	(cd $@; rm -f ogg.h && echo "#include <ogg/ogg.h>" > ogg.h && rm -f os_types.h && echo "#include <ogg/os_types.h>" > os_types.h && ./autogen.sh)
@@ -824,7 +824,7 @@ ifdef HAVE_WIN32
 	patch -p0 < Patches/libshout-win32.patch
 	(cd $@; autoreconf && automake)
 endif
-  
+
 .shout: libshout .theora .ogg .speex .vorbis
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) &&  make && make install )
 	$(INSTALL_NAME)
@@ -849,7 +849,7 @@ endif
 
 FLAC_DISABLE_FLAGS = --disable-oggtest --disable-xmms-plugin --disable-cpplibs
 
-.flac: flac .ogg 
+.flac: flac .ogg
 ifdef HAVE_WIN32
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(FLAC_DISABLE_FLAGS) && cd src&& make -C libFLAC&& make -C libFLAC install && cd .. && make -C include install)
 else
@@ -973,13 +973,13 @@ ifdef HAVE_WIN32
 else
 	(cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
 	$(RANLIB) $(PREFIX)/lib/libebml.a
-endif	
+endif
 	touch $@
 ## No reasons to use SVN anymore
 #ifdef SVN
 #libebml-source: libebml
 #	tar cfvz  libebml-$(DATE).tar.gz libebml
-#SOURCE += libebml-source	
+#SOURCE += libebml-source
 #endif
 
 CLEAN_FILE += .ebml
@@ -1000,7 +1000,7 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
 #else
 libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-#endif 
+#endif
 	patch -p0 < ./Patches/libmatroska-kaxblock.patch
 ifdef HAVE_WIN32
 	(cd $@; patch -p0 < ../Patches/libmatroska-win32.patch)
@@ -1142,7 +1142,7 @@ libdvdcss-$(LIBDVDCSS_VERSION).tar.gz:
 	$(WGET) $(LIBDVDCSS_URL)
 
 ifdef SVN
-libdvdcss: 
+libdvdcss:
 	$(SVN) co svn://svn.videolan.org/libdvdcss/trunk libdvdcss
 	cd $@ && sh bootstrap
 else
@@ -1172,7 +1172,7 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 # .dvdread: .dvdnav
 # 	$(INSTALL_NAME)
 # 	touch $@
-# 
+#
 # CLEAN_FILE += .dvdread
 
 # ***************************************************************************
@@ -1180,7 +1180,7 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 # ***************************************************************************
 
 
-libdvdread: 
+libdvdread:
 	$(SVN) co $(LIBDVDREAD_SVN)  libdvdread
 	(cd $@; patch  -p 0 < ../Patches/libdvdread.patch)
 ifdef HAVE_WIN32
@@ -1220,7 +1220,7 @@ endif
 endif
 
 .dvdnav: libdvdnav .libdvdread
-ifdef HAVE_WIN32	
+ifdef HAVE_WIN32
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) && make && make install)
 else
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -Dlseek64=lseek -Doff64_t=off_t" && make && make install)
@@ -1264,9 +1264,9 @@ live: live555-$(LIVEDOTCOM_VERSION).tar.gz
 	patch -p0 < Patches/live-uselocale.patch
 
 .live: live
-ifdef HAVE_WIN32  
-	(cd $<;./genMakefiles mingw && make $(HOSTCC)) 
-else 
+ifdef HAVE_WIN32
+	(cd $<;./genMakefiles mingw && make $(HOSTCC))
+else
 ifdef HAVE_DARWIN_OS
 	(cd $<; sed -e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' -e 's%cc%$(CC)%'  -e 's%c++%$(CXX)%' -i.orig  config.macosx)
 	(cd $<; ./genMakefiles macosx && make)
@@ -1316,7 +1316,7 @@ ifneq ($(DARWIN_COMPILER),LLVMGCC)
 	patch -p0 < Patches/goom2k4-0-mmx.patch
 endif
 endif
-patch -p0 < Patches/goom2k4-0-memleaks.patch
+	patch -p0 < Patches/goom2k4-0-memleaks.patch
 
 .goom2k4: goom
 ifdef HAVE_DARWIN_OS
@@ -1602,7 +1602,7 @@ Qt_win32: qt-win-opensource-$(QT4T_VERSION)-mingw.exe
 	cp -r Qt/src/corelib Qt/src/gui $(PREFIX)/include/qt4/src
 	cp Qt/lib/libQtCore4.a Qt/lib/libQtGui4.a $(PREFIX)/lib
 	cp Qt/lib/pkgconfig/* $(PREFIX)/lib/pkgconfig
-	cp Qt/translations/* $(PREFIX)/share/qt4/translations 
+	cp Qt/translations/* $(PREFIX)/share/qt4/translations
 	touch $@
 
 CLEAN_FILE += .Qt_win32
@@ -1648,7 +1648,7 @@ CLEAN_PKG += zlib
 DISTCLEAN_PKG += zlib-$(ZLIB_VERSION).tar.gz
 
 # ***************************************************************************
-# PortAudio 
+# PortAudio
 # ***************************************************************************
 
 pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz:
@@ -1660,7 +1660,7 @@ ifneq ($(HOST),$(BUILD))
 	(patch -p0 < Patches/portaudio-cross.patch;cd $@;  autoconf)
 endif
 
-.portaudio: portaudio 
+.portaudio: portaudio
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make  install)
 	$(INSTALL_NAME)
 	touch $@
@@ -1713,7 +1713,7 @@ ifdef HAVE_BEOS
 endif
 ifdef HAVE_WIN32
 	(cd twolame/win32; $(WGET) "http://twolame.svn.sourceforge.net/viewvc/*checkout*/twolame/trunk/win32/winutil.h")
-endif	
+endif
 
 .twolame: twolame
 	(cd twolame; $(HOSTCC) CFLAGS="${CFLAGS}  -DLIBTWOLAME_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX) && cd libtwolame &&  make && make install)
@@ -1824,7 +1824,7 @@ libraw1394: libraw1394-$(LIBRAW1394_VERSION).tar.gz
 	(cd $<; ./configure --prefix=$(PREFIX) && make && make DESTDIR=$(PREFIX) install)
 #	sed 's/^typedef u_int8_t  byte_t;/\/* typedef u_int8_t  byte_t;\*\//'
 	touch $@
-	
+
 CLEAN_FILE += .raw1394
 CLEAN_PKG += libraw1394
 DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION).tar.gz
@@ -1856,13 +1856,13 @@ libdc1394: libdc1394-$(LIBDC1394_VERSION).tar.gz
 	 patch -p1 < ../Patches/libdc1394-noexamples.patch && \
 	 make && make DESTDIR=$(PREFIX) install)
 	touch $@
-	
+
 CLEAN_FILE += .dc1394
 CLEAN_PKG += libdc1394
 DISTCLEAN_PKG += libdc1394-$(LIBDC1394_VERSION).tar.gz
 
 # ***************************************************************************
-# gpg-error 
+# gpg-error
 # ***************************************************************************
 
 libgpg-error-$(GPGERROR_VERSION).tar.bz2:
@@ -1894,7 +1894,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 	patch -p0 < Patches/gcrypt.patch
 
-CIPHDIG= --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd160 --enable-publickey-digests=dsa 
+CIPHDIG= --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd160 --enable-publickey-digests=dsa
 
 .gcrypt: libgcrypt .gpg-error
 ifdef HAVE_WIN32
@@ -1916,7 +1916,7 @@ DISTCLEAN_PKG += libgcrypt-$(GCRYPT_VERSION).tar.bz2
 opencdk-$(OPENCDK_VERSION).tar.bz2:
 	$(WGET) $(OPENCDK_URL)
 
-opencdk: opencdk-$(OPENCDK_VERSION).tar.bz2 
+opencdk: opencdk-$(OPENCDK_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 
 .opencdk: opencdk
@@ -1942,7 +1942,7 @@ ifdef HAVE_WIN32
 	(cd $@; autoconf)
 endif
 
-.gnutls: gnutls .gcrypt .gpg-error 
+.gnutls: gnutls .gcrypt .gpg-error
 ifdef HAVE_WIN32
 	(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)
 else
@@ -2084,7 +2084,7 @@ DISTCLEAN_PKG += mozilla-source-$(MOZILLA_VERSION).tar.bz2
 jpeg-$(JPEG_VERSION).tar.gz:
 	$(WGET) $(JPEG_URL)
 
-jpeg: jpeg-$(JPEG_VERSION).tar.gz 
+jpeg: jpeg-$(JPEG_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .jpeg: jpeg
@@ -2103,7 +2103,7 @@ DISTCLEAN_PKG += jpeg-$(JPEG_VERSION).tar.gz
 tiff-$(TIFF_VERSION).tar.gz:
 	$(WGET) $(TIFF_URL)
 
-tiff: tiff-$(TIFF_VERSION).tar.gz 
+tiff: tiff-$(TIFF_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .tiff: tiff
@@ -2127,10 +2127,10 @@ ifndef HAVE_DARWIN_OS
 SDL-$(SDL_VERSION).tar.gz:
 	$(WGET) $(SDL_URL)
 
-SDL: SDL-$(SDL_VERSION).tar.gz 
+SDL: SDL-$(SDL_VERSION).tar.gz
 	$(EXTRACT_GZ)
 else
-SDL: 
+SDL:
 	$(SVN) co http://svn.libsdl.org/trunk/SDL -r 4444 SDL
 	(cd $@; sh autogen.sh)
 endif
@@ -2151,7 +2151,7 @@ DISTCLEAN_PKG += SDL-$(SDL_VERSION).tar.gz
 SDL_image-$(SDL_IMAGE_VERSION).tar.gz:
 	$(WGET) $(SDL_IMAGE_URL)
 
-SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz 
+SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz
 	$(EXTRACT_GZ)
 	patch -p0 < Patches/SDL_image.patch
 	patch -p0 < Patches/SDL_image-CVE-2006-4484.patch
@@ -2172,13 +2172,13 @@ DISTCLEAN_PKG += SDL_image-$(SDL_IMAGE_VERSION).tar.gz
 libmpcdec-$(MUSE_VERSION).tar.bz2:
 	$(WGET) $(MUSE_URL)
 
-mpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2 
+mpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 	patch -p0 < Patches/mpcdec.patch
 	(cd $@; autoreconf)
 
 .mpcdec: mpcdec
-ifdef HAVE_WIN32 
+ifdef HAVE_WIN32
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS=-D_PTRDIFF_T=mpc_int32_t && make && make install)
 else
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
@@ -2241,7 +2241,7 @@ win32-dx7headers.tgz:
 	touch $@
 CLEAN_FILE += .dx_headers
 DISTCLEAN_PKG += win32-dx7headers.tgz
- 
+
 # *************************************************************************
 # DirectShow headers
 # *************************************************************************
@@ -2564,7 +2564,7 @@ clean-src: clean
 	rm -rf $(DISTCLEAN_PKG)
 
 clean-svn:
-	rm -rf ffmpeg tremor x264 libdca pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz portaudio live555-$(LIVEDOTCOM_VERSION).tar.gz live	
+	rm -rf ffmpeg tremor x264 libdca pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz portaudio live555-$(LIVEDOTCOM_VERSION).tar.gz live
 
 distclean: clean-src