X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=Makefile;h=31af5e302cd8a27906df7a361ab38397acf81780;hb=07cc0ebf6a7141a76fd9b6e2da6cf510def1ebc7;hp=39567bfc77d59dad995d1c6449f70980bf6411de;hpb=dc67ade1f6cea071dac6a94556bffb662f2914be;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/Makefile b/Makefile
index 39567bfc..31af5e30 100644
--- a/Makefile
+++ b/Makefile
@@ -1,64 +1,134 @@
+include Makefile.config
+
 SYSTEM = $(shell uname -s)
 
 # Special case for Mac OS X: everything is handled from the Xcode project
+
+#
+# Darwin
+#
 ifeq ($(SYSTEM),Darwin)
 
-all:    clean app release
+snapshot:   clean snapshot-app
+
+all:    clean app
+
+all-chunky:    clean app-chunky
+
+test:	clean cli
+
+dev:	clean internal
+
+app:    libhb/hbversion.h
+	(./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -target libhb -target HandBrake -target HandBrakeCLI -configuration UB HB_BUILD="$(HB_BUILD)" HB_VERSION="$(HB_VERSION)" APPCAST_URL="http://handbrake.fr/appcast.xml" build | sed '/^$$/d'  )
+
+contrib/.contrib:
+	@$(MAKE) --no-print-directory -C contrib all
+
+snapshot-app: contrib/.contrib unstable-libhb/hbversion.h
+	( cd macosx ; xcodebuild -target libhb -target HandBrake -target HandBrakeCLI -configuration Deployment HB_BUILD="$(SNAP_HB_BUILD)" HB_VERSION="$(SNAP_HB_VERSION)" CURRENT_PROJECT_VERSION="$(SNAP_HB_VERSION)" APPCAST_URL="http://handbrake.fr/appcast_unstable.xml" build | sed '/^$$/d' )
 
-app:
-	(./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -alltargets -configuration UB build | sed '/^$$/d' ; cd .. ; ./macosx/localize.sh MediaFork.app)
+app-chunky: libhb/hbversion.h
+	(./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -alltargets -configuration UB HB_BUILD="$(HB_BUILD)" HB_VERSION="$(HB_VERSION)" APPCAST_URL="http://handbrake.fr/appcast.xml" build | sed '/^$$/d'  )
+
+cli:    libhb/hbversion.h
+	(./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -target libhb -target HandBrakeCLI -configuration UB HB_BUILD="$(HB_BUILD)" HB_VERSION="$(HB_VERSION)" build | sed '/^$$/d' )
 
 clean:
-	(cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' )
+	(cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' ; rm -f libhb/hbversion.h ; rm -f contrib/config.cache )
 
 mrproper:
-	(rm -rf contrib/*tar.gz contrib/include contrib/lib contrib/DarwinContribVersion.txt ; cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' )
+	(rm -rf libhb/hbversion.h 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 )
+
+gui-release:
+	(rm -rf HandBrake HandBrake*GUI_UB.dmg ; mkdir -p HandBrake/docs ; cp AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/docs ; cp -rp HandBrake.app HandBrake  ; hdiutil create -srcfolder HandBrake  -format UDBZ HandBrake-$(HB_VERSION)-MacOSX.4_GUI_UB.dmg ; rm -rf HandBrake )
+
+cli-release:
+	(rm -rf HandBrake HandBrake*CLI_UB.dmg ; mkdir -p HandBrake/docs ; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/docs ; cp -rp HandBrakeCLI HandBrake ; hdiutil create -srcfolder HandBrake  -format UDZO HandBrake-$(HB_VERSION)-MacOSX.3_CLI_UB.dmg ; rm -rf HandBrake )
+
+gui-snapshot-release:
+	(rm -rf HandBrake HandBrake*GUI_UB.dmg ; mkdir -p HandBrake/docs ; cp AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/docs ; cp -rp HandBrake.app HandBrake  ; hdiutil create -srcfolder HandBrake  -format UDBZ HandBrake-$(SNAP_HB_VERSION)-MacOSX.5_GUI_UB.dmg ; rm -rf HandBrake )
+
+cli-snapshot-release:
+	(rm -rf HandBrake HandBrake*CLI_UB.dmg ; mkdir -p HandBrake/docs ; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/docs ; cp -rp HandBrakeCLI HandBrake ; hdiutil create -srcfolder HandBrake  -format UDZO HandBrake-$(SNAP_HB_VERSION)-MacOSX.5_CLI_UB.dmg ; rm -rf HandBrake )
+
 endif
 
+#
+# Linux
+#
 ifeq ($(SYSTEM),Linux)
 
-all:	contrib/lib libmediafork/libmediafork.a MediaForkCLI
+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/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: unstable-libhb/hbversion.h
+	@$(MAKE) --no-print-directory -C libhb all
 
-MediaForkCLI:
+HandBrakeCLI: libhb/libhb.a
 	@$(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
+	@rm libhb/hbversion.h
+	@rm -f contrib/config.cache
 
 mrproper: clean
-	(rm -rf contrib/lib ; rm -rf contrib/include/* )
+	@$(MAKE) --no-print-directory -C contrib mrproper
 
 endif
 
-ifeq ($(SYSTEM),CYGWIN_NT-5.1)
+#
+# Cygwin
+#
+ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)
 
-all:    contrib/lib libmediafork/libmediafork.a MediaForkCLI
+all:    contrib/.contrib HandBrakeCLI
 
-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: unstable-libhb/hbversion.h
+	@$(MAKE) --no-print-directory -C libhb all
 
-MediaForkCLI:
+HandBrakeCLI: libhb/libhb.a
 	@$(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
+	@rm libhb/hbversion.h
 
 mrproper: clean
-	(rm -rf contrib/lib ; rm -rf contrib/include/* )
+	@$(MAKE) --no-print-directory -C contrib mrproper
 
 endif
+
+libhb/hbversion.h:
+	echo "#ifndef HB_BUILD" > libhb/hbversion.h
+	echo "#define HB_BUILD $(HB_BUILD)" >> libhb/hbversion.h
+	echo "#endif" >> libhb/hbversion.h
+	echo "#ifndef HB_VERSION" >> libhb/hbversion.h
+	echo "#define HB_VERSION \"$(HB_VERSION)\"" >> libhb/hbversion.h
+	echo "#endif" >> libhb/hbversion.h
+	echo "#ifndef HB_APPCAST_URL" >> libhb/hbversion.h
+	echo "#define APPCAST_URL \"http://handbrake.fr/appcast.xml\"" >> libhb/hbversion.h
+	echo "#endif" >> libhb/hbversion.h
+
+unstable-libhb/hbversion.h:
+	echo "#ifndef HB_BUILD" > libhb/hbversion.h
+	echo "#define HB_BUILD $(SNAP_HB_BUILD)" >> libhb/hbversion.h
+	echo "#endif" >> libhb/hbversion.h
+	echo "#ifndef HB_VERSION" >> libhb/hbversion.h
+	echo "#define HB_VERSION \"$(SNAP_HB_VERSION)\"" >> libhb/hbversion.h
+	echo "#endif" >> libhb/hbversion.h
+	echo "#ifndef HB_APPCAST_URL" >> libhb/hbversion.h
+	echo "#define APPCAST_URL \"http://handbrake.fr/appcast_unstable.xml\"" >> libhb/hbversion.h
+	echo "#endif" >> libhb/hbversion.h