Updated makefile for cygwin builds

app = download contrib binary package and compile source
all = use Jam to build the source
Works the same way as linux does now.

git-svn-id: svn://localhost/HandBrake/trunk@1149 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/Makefile b/Makefile
index 8d9f1e2..67e6cce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,9 @@ SYSTEM = $(shell uname -s)
 \r
 # Special case for Mac OS X: everything is handled from the Xcode project\r
 \r
+#\r
+# Darwin\r
+#\r
 ifeq ($(SYSTEM),Darwin)\r
 \r
 all:    clean app\r
@@ -40,12 +43,14 @@ cli-release:
 \r
 endif\r
 \r
+#\r
+# Linux\r
+#\r
 ifeq ($(SYSTEM),Linux)\r
 \r
 all:   contrib/.contrib libhb/libhb.a HandBrakeCLI\r
        (rm -rf HandBrake HandBrake*.tar.gz ; mkdir -p HandBrake/api HandBrake/doc; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/doc ;  cp -rp libhb/libhb.so HandBrake/api ; cp -rp libhb/hb.h libhb/common.h libhb/ports.h HandBrake/api ; cp -rp HandBrakeCLI HandBrake ; tar zcvf HandBrake-$(HB_VERSION)_i386.tar.gz HandBrake ; rm -rf HandBrake )\r
 \r
-\r
 contrib/.contrib:\r
        @$(MAKE) --no-print-directory -C contrib all\r
 \r
@@ -64,27 +69,27 @@ mrproper: clean
 \r
 endif\r
 \r
+#\r
+# Cygwin\r
+#\r
 ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)\r
 \r
-all:    contrib/.contrib libhb/libhb.a \r
+all:    contrib/.contrib libhb/libhb.a HandBrakeCLI\r
 \r
+app:   contribPack libhb/libhb.a HandBrakeCLI\r
 \r
-app:\r
+contribPack:\r
        (./DownloadCygWinContribBinaries.sh)\r
-HandbrakeCLI: app libhb/libhb.a\r
-\r
-\r
+       \r
 contrib/.contrib:\r
        @$(MAKE) --no-print-directory -C contrib all\r
 \r
 libhb/libhb.a:\r
        @$(MAKE) --no-print-directory -C libhb all\r
 \r
-HandbrakeCLI:\r
+HandBrakeCLI: \r
        @$(MAKE) --no-print-directory -C test all\r
        \r
-\r
-       \r
 clean:\r
        @$(MAKE) --no-print-directory -C libhb clean\r
        @$(MAKE) --no-print-directory -C test clean\r