Finally recommitting clee's patch from r518 to allow 64-bit mp4 files that can hold...

[handbrake-jp/handbrake-jp-git.git] / Makefile

diff --git a/Makefile b/Makefile
index ed1f053..655ee4f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,17 @@
+include Makefile.config
+
 SYSTEM = $(shell uname -s)
 
 # Special case for Mac OS X: everything is handled from the Xcode project
+
 ifeq ($(SYSTEM),Darwin)
 
-all:    clean app release
+all:    clean app
+
+dev:   clean internal
 
 app:
-       (./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -alltargets -configuration UB build | sed '/^$$/d' ; cd .. ; ./macosx/localize.sh MediaFork.app)
+       (./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -alltargets -configuration UB  OTHER_CFLAGS_QUOTED_1="-DHB_VERSION=\\\"$(HB_VERSION)\\\" -DHB_BUILD=$(HB_BUILD) " build | sed '/^$$/d' ; cd .. ; ./macosx/localize.sh HandBrake.app $(HB_VERSION) $(HB_BUILD) UB )
 
 clean:
        (cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' )
@@ -15,50 +20,60 @@ mrproper:
        (rm -rf contrib/*tar.gz contrib/include contrib/lib contrib/DarwinContribVersion.txt ; cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' )
 
 release:
-       (rm -rf MediaFork MediaFork.dmg ; mkdir -p MediaFork/api MediaFork/doc; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS MediaFork/doc ; cp -rp *MediaFork.app MediaFork ; cp -rp libmediafork/libmediafork.dylib MediaFork/api ; cp -rp libmediafork/mediafork.h libmediafork/common.h libmediafork/ports.h MediaFork/api ; cp -rp MediaForkCLI MediaFork ; hdiutil create -srcfolder MediaFork  -format UDBZ MediaFork.dmg ; rm -rf MediaFork )
-   
+       (rm -rf HandBrake HandBrake*dmg ; mkdir -p HandBrake/api HandBrake/doc HandBrake/doc/pdf; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/doc ; cp -rp pdf/ HandBrake/doc/pdf/ ; cp -rp HandBrake.app HandBrake ; cp -rp libhb/libhb.dylib HandBrake/api ; cp -rp libhb/hb.h libhb/common.h libhb/ports.h HandBrake/api ; cp -rp HandBrakeCLI HandBrake ; hdiutil create -srcfolder HandBrake  -format UDZO HandBrake-$(HB_VERSION)-MacOS_UB.dmg ; rm -rf HandBrake )
+
 endif
 
 ifeq ($(SYSTEM),Linux)
 
-all:   contrib/lib libmediafork/libmediafork.a MediaForkCLI
+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/lib:
-       (./configure ; cd contrib ; cp -f ../config.jam . ; jam ; cd ..)
+contrib/.contrib:
+       @$(MAKE) --no-print-directory -C contrib all
 
-libmediafork/libmediafork.a:
-       @$(MAKE) --no-print-directory -C libmediafork all
+libhb/libhb.a:
+       @$(MAKE) --no-print-directory -C libhb all
 
-MediaForkCLI:
+HandBrakeCLI:
        @$(MAKE) --no-print-directory -C test all
 
 clean:
-       @$(MAKE) --no-print-directory -C libmediafork clean
+       @$(MAKE) --no-print-directory -C libhb 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/.contrib libhb/libhb.a 
+
+
+app:
+       (./DownloadCygWinContribBinaries.sh)
+HandbrakeCLI: app libhb/libhb.a
+
 
-contrib/lib:
-       (./configure ; cd contrib ; cp -f ../config.jam . ; jam.exe ; cd ..)
+contrib/.contrib:
+       @$(MAKE) --no-print-directory -C contrib all
 
-libmediafork/libmediafork.a:
-       @$(MAKE) --no-print-directory -C libmediafork all
+libhb/libhb.a:
+       @$(MAKE) --no-print-directory -C libhb all
 
-MediaForkCLI:
+HandbrakeCLI:
        @$(MAKE) --no-print-directory -C test all
+       
 
+       
 clean:
-       @$(MAKE) --no-print-directory -C libmediafork clean
+       @$(MAKE) --no-print-directory -C libhb 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