Index: Makefile
===================================================================
--- Makefile	(revision 1148)
+++ Makefile	(working copy)
@@ -4,6 +4,9 @@
 
 # Special case for Mac OS X: everything is handled from the Xcode project
 
+#
+# Darwin
+#
 ifeq ($(SYSTEM),Darwin)
 
 all:    clean app
@@ -40,12 +43,14 @@
 
 endif
 
+#
+# Linux
+#
 ifeq ($(SYSTEM),Linux)
 
 all:	contrib/.contrib libhb/libhb.a HandBrakeCLI
 	(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 )
 
-
 contrib/.contrib:
 	@$(MAKE) --no-print-directory -C contrib all
 
@@ -64,27 +69,27 @@
 
 endif
 
+#
+# Cygwin
+#
 ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)
 
-all:    contrib/.contrib libhb/libhb.a 
+all:    contrib/.contrib libhb/libhb.a HandBrakeCLI
 
+app:	contribPack libhb/libhb.a HandBrakeCLI
 
-app:
+contribPack:
 	(./DownloadCygWinContribBinaries.sh)
-HandbrakeCLI: app libhb/libhb.a
-
-
+	
 contrib/.contrib:
 	@$(MAKE) --no-print-directory -C contrib all
 
 libhb/libhb.a:
 	@$(MAKE) --no-print-directory -C libhb all
 
-HandbrakeCLI:
+HandBrakeCLI: 
 	@$(MAKE) --no-print-directory -C test all
 	
-
-	
 clean:
 	@$(MAKE) --no-print-directory -C libhb clean
 	@$(MAKE) --no-print-directory -C test clean