Stronger Makefile for linux and CYGWIN, CTRL-C can now be done and make can be replayed.

Thx to rhester to talk about the trouble.

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.8.0_beta2@304 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/Makefile b/Makefile
index 3d6eadcd59e2dc267ed1cdbe7a21465277cad7df..03ea17ef40eb3cc0845d2b87c8590660b84824fc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,9 +24,9 @@ endif
 
 ifeq ($(SYSTEM),Linux)
 
-all:   contrib/lib libmediafork/libmediafork.a MediaForkCLI
+all:   contrib/.contrib libmediafork/libmediafork.a MediaForkCLI
 
-contrib/lib:
+contrib/.contrib:
        @$(MAKE) --no-print-directory -C contrib all
 
 libmediafork/libmediafork.a:
@@ -46,9 +46,9 @@ endif
 
 ifeq ($(SYSTEM),CYGWIN_NT-5.1)
 
-all:    contrib libmediafork/libmediafork.a MediaForkCLI
+all:    contrib/.contrib libmediafork/libmediafork.a MediaForkCLI
 
-contrib:
+contrib/.contrib:
        @$(MAKE) --no-print-directory -C contrib all
 
 libmediafork/libmediafork.a:

diff --git a/contrib/Jamfile b/contrib/Jamfile
index 94016f02f2fca28d0e82eb2bb92c4d4a19d34996..8239c9fc6f0667d9e10965ea1b5dfa0234ef1b24 100644 (file)
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -339,7 +339,7 @@ actions LibXvidCore
     cd build/generic/ && ./configure && make libxvidcore.a &&
     cp ./=build/libxvidcore.a $CONTRIB/lib/ &&
     cp ../../src/xvid.h $CONTRIB/include/ &&
-    strip -S $CONTRIB/lib/libxvidcore.a
+    strip -S $CONTRIB/lib/libxvidcore.a && touch $CONTRIB/.contrib
 }
 Wget        $(SUBDIR)/xvidcore.tar.gz   : $(SUBDIR)/version_xvidcore.txt ;
 LibXvidCore $(SUBDIR)/lib/libxvidcore.a : $(SUBDIR)/xvidcore.tar.gz ;

diff --git a/contrib/Makefile b/contrib/Makefile
index d402dca64258b869f801c472efa890c1ab10d7ac..34d2bd282e575cde9f4131324bf5be3a3820e288 100644 (file)
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -12,7 +12,9 @@ endif
 
 ifeq ($(SYSTEM),Linux)
 
-all:
+all:   .contrib
+
+.contrib:
        ( cd .. ; ./configure ; cd contrib ; cp -f ../config.jam . ; jam )
 
 clean: 
@@ -25,7 +27,9 @@ endif
 
 ifeq ($(SYSTEM),CYGWIN_NT-5.1)
 
-all:    
+all:   .contrib
+
+.contrib:    
        ( cd .. ; ./configure ; cd contrib ; cp -f ../config.jam . ; jam.exe )
 
 clean: