Some Makefile corrections

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

diff --git a/Makefile b/Makefile
index 39567bfc77d59dad995d1c6449f70980bf6411de..3d6eadcd59e2dc267ed1cdbe7a21465277cad7df 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+MF_BUILD = $(shell date "+%Y%m%d")00
+MF_VERSION = "0.8.0b2"
+
 SYSTEM = $(shell uname -s)
 
 # Special case for Mac OS X: everything is handled from the Xcode project
@@ -24,7 +27,7 @@ ifeq ($(SYSTEM),Linux)
 all:   contrib/lib libmediafork/libmediafork.a MediaForkCLI
 
 contrib/lib:
-       (./configure ; cd contrib ; cp -f ../config.jam . ; jam ; cd ..)
+       @$(MAKE) --no-print-directory -C contrib all
 
 libmediafork/libmediafork.a:
        @$(MAKE) --no-print-directory -C libmediafork all
@@ -37,16 +40,16 @@ clean:
        @$(MAKE) --no-print-directory -C test clean
 
 mrproper: clean
-       (rm -rf contrib/lib ; rm -rf contrib/include/* )
+       @$(MAKE) --no-print-directory -C contrib mrproper
 
 endif
 
 ifeq ($(SYSTEM),CYGWIN_NT-5.1)
 
-all:    contrib/lib libmediafork/libmediafork.a MediaForkCLI
+all:    contrib libmediafork/libmediafork.a MediaForkCLI
 
-contrib/lib:
-       (./configure ; cd contrib ; cp -f ../config.jam . ; jam.exe ; cd ..)
+contrib:
+       @$(MAKE) --no-print-directory -C contrib all
 
 libmediafork/libmediafork.a:
        @$(MAKE) --no-print-directory -C libmediafork all
@@ -59,6 +62,6 @@ clean:
        @$(MAKE) --no-print-directory -C test clean
 
 mrproper: clean
-       (rm -rf contrib/lib ; rm -rf contrib/include/* )
+       @$(MAKE) --no-print-directory -C contrib mrproper
 
 endif

diff --git a/libmediafork/Makefile b/libmediafork/Makefile
index 5310b7c84d0309ac0ab504d4c8acb7ac65ed0236..4d176de46936d5613a38e96124002d8899176b57 100644 (file)
--- a/libmediafork/Makefile
+++ b/libmediafork/Makefile
@@ -1,25 +1,21 @@
 SYSTEM = $(shell uname -s)
 
-ifeq ($(SYSTEM),Linux)
-       SYSDEF=-DSYS_LINUX
-endif
-
 ifeq ($(SYSTEM),CYGWIN_NT-5.1)
        SYSDEF=-DSYS_CYGWIN
 endif
 
 ifeq ($(SYSTEM),FreeBSD)
-       CFLAGS += -DSYS_FREEBSD
+       SYSDEF = -DSYS_FREEBSD
        LDFLAGS += -pthread -lm
 endif
        
 ifeq ($(SYSTEM),NetBSD)
-       CFLAGS += -DSYS_NETBSD
+       SYSDEF = -DSYS_NETBSD
        LDFLAGS += -lpthread -lm
 endif
        
 ifeq ($(SYSTEM),Linux)
-       CFLAGS += -DSYS_LINUX
+       SYSDEF = -DSYS_LINUX
        LDFLAGS += -lpthread -lm
 endif
 
@@ -52,11 +48,10 @@ CONTRIBS = ../contrib/lib/liba52.a ../contrib/lib/libavformat.a \
            ../contrib/lib/libsamplerate.a ../contrib/lib/libx264.a \
            ../contrib/lib/libxvidcore.a  ../contrib/lib/libmp4v2.a
 endif
-BUILD = $(shell date "+%Y%m%d")00
 
-CFLAGS += -I../contrib/include -D__LIBMEDIAFORK__ -DUSE_PTHREAD -DHB_VERSION=\"0.8.0b1\" -DHB_BUILD=$(BUILD) $(SYSDEF)
+CFLAGS += -I../contrib/include -D__LIBMEDIAFORK__ -DUSE_PTHREAD -DHB_VERSION=\"$(MF_VERSION)\" -DHB_BUILD=$(MF_BUILD) $(SYSDEF)
 
-CXXFLAGS += -I../contrib/include -D__LIBMEDIAFORK__ -DUSE_PTHREAD -DHB_VERSION=\"0.8.0b1\" -DHB_BUILD=$(BUILD) $(SYSDEF)
+CXXFLAGS += -I../contrib/include -D__LIBMEDIAFORK__ -DUSE_PTHREAD -DHB_VERSION=\"$(MF_VERSION)\" -DHB_BUILD=$(BUILD) $(SYSDEF)
 
 ifeq ($(SYSTEM),CYGWIN_NT-5.1)
 all: libmediafork.a libmediafork.dll