for linux and cygwin. fix dep for HandBrakeCLI so that it is rebuilt when libhb...

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

diff --git a/Makefile b/Makefile
index b2849f24cf7f5a60b0af0124f320409178e3d3b1..6ed92da0099ba6b2e7bc9f0a78e30df61500bf3f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -62,8 +62,8 @@ endif
 #
 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 )
+all:   contrib/.contrib 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/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
@@ -71,7 +71,7 @@ contrib/.contrib:
 libhb/libhb.a: unstable-libhb/hbversion.h
        @$(MAKE) --no-print-directory -C libhb all
 
-HandBrakeCLI:
+HandBrakeCLI: libhb/libhb.a
        @$(MAKE) --no-print-directory -C test all
 
 clean:
@@ -89,7 +89,7 @@ endif
 #
 ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)
 
-all:    contrib/.contrib libhb/libhb.a HandBrakeCLI
+all:    contrib/.contrib HandBrakeCLI
 
 app:   contribPack libhb/libhb.a HandBrakeCLI
 
@@ -102,7 +102,7 @@ contrib/.contrib:
 libhb/libhb.a: unstable-libhb/hbversion.h
        @$(MAKE) --no-print-directory -C libhb all
 
-HandBrakeCLI: 
+HandBrakeCLI: libhb/libhb.a
        @$(MAKE) --no-print-directory -C test all
        
 clean: