Updated jamfile to fix a small compile issue with zlib

Updated makefiles to support cygwin building on platforms other than XP

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1109 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 42 insertions, 42 deletions

diff --git a/contrib/Jamfile b/contrib/Jamfile
index 86d35a536..0c2fa30b2 100644
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -415,7 +415,7 @@ if $(OS) = CYGWIN
     {
         cd `dirname $(>)` && CONTRIB=`pwd` &&
         rm -rf zlib && (gzip -dc zlib.tar.gz | tar xf - ) &&
-        cd zlib && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache &&
+        cd zlib && ./configure --prefix=$CONTRIB &&
         $(MAKE) && $(MAKE) install && touch $CONTRIB/.contrib &&
         $(STRIP) $CONTRIB/lib/libz.a
     }
diff --git a/contrib/Makefile b/contrib/Makefile
index b39c53ea6..33baec42c 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -1,41 +1,41 @@
-# Contrib Makefile
-
-SYSTEM = $(shell uname -s)
-
-# Special case for Mac OS X: everything is handled from the Xcode project
-ifeq ($(SYSTEM),Darwin)
-
-all:
-	( echo "MacOs X doesn't use this makefile, to build the contrib please use ../jam" ; false )
-
-endif
-
-ifeq ($(SYSTEM),Linux)
-
-all:	.contrib
-
-.contrib:
-	( cd .. ; ./configure ; cd contrib ; cp -f ../config.jam . ; jam )
-
-clean:	
-	( echo "Do a make mrproper to remove the contrib libraries )
-
-mrproper: 
-	(rm -rf lib ; rm -rf include )
-
-endif
-
-ifeq ($(SYSTEM),CYGWIN_NT-5.1)
-
-all:	.contrib
-
-.contrib:    
-	( cd .. ; ./configure ; cd contrib ; cp -f ../config.jam . ; jam.exe )
-
-clean:
-	( echo "Do a make mrproper to remove the contrib libraries )
-
-mrproper: clean
-	(rm -rf lib ; rm -rf include ; rm -f .contrib)
-
-endif
+# Contrib Makefile

+

+SYSTEM = $(shell uname -s)

+

+# Special case for Mac OS X: everything is handled from the Xcode project

+ifeq ($(SYSTEM),Darwin)

+

+all:

+	( echo "MacOs X doesn't use this makefile, to build the contrib please use ../jam" ; false )

+

+endif

+

+ifeq ($(SYSTEM),Linux)

+

+all:	.contrib

+

+.contrib:

+	( cd .. ; ./configure ; cd contrib ; cp -f ../config.jam . ; jam )

+

+clean:	

+	( echo "Do a make mrproper to remove the contrib libraries )

+

+mrproper: 

+	(rm -rf lib ; rm -rf include )

+

+endif

+

+ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)

+

+all:	.contrib

+

+.contrib:    

+	( cd .. ; ./configure ; cd contrib ; cp -f ../config.jam . ; jam.exe )

+

+clean:

+	( echo "Do a make mrproper to remove the contrib libraries )

+

+mrproper: clean

+	(rm -rf lib ; rm -rf include ; rm -f .contrib)

+

+endif