SunOS support fixed with new ffmpeg and x264

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

diff --git a/Makefile b/Makefile
index b2849f2..31af5e3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ 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' ; rm -f libhb/hbversion.h )
+       (cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' ; rm -f libhb/hbversion.h ; rm -f contrib/config.cache )
 
 mrproper:
        (rm -rf libhb/hbversion.h contrib/*tar.gz contrib/include contrib/lib contrib/DarwinContribVersion.txt ; cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' )
@@ -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,13 +71,14 @@ 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:
        @$(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
        @$(MAKE) --no-print-directory -C contrib mrproper
@@ -89,20 +90,15 @@ 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
-
-contribPack:
-       (./DownloadCygWinContribBinaries.sh)
-       
 contrib/.contrib:
        @$(MAKE) --no-print-directory -C contrib all
 
 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: