diff options
author | sr55 <[email protected]> | 2007-12-08 20:49:54 +0000 |
---|---|---|
committer | sr55 <[email protected]> | 2007-12-08 20:49:54 +0000 |
commit | 2111b9f456626a91191f16de0ac122c847b9280a (patch) | |
tree | 502ead5a3d4653baf4e33882b599879fcc33ce2b /contrib/Makefile | |
parent | 63ee07ac2348ba5e4e47834656e1941df96814e1 (diff) |
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
Diffstat (limited to 'contrib/Makefile')
-rw-r--r-- | contrib/Makefile | 82 |
1 files changed, 41 insertions, 41 deletions
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
|