X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=make%2Finclude%2Fcontrib.defs;h=fcff27356ac29b551b56debda2ec13388553f6d9;hb=ce5ed36e140b4ae5aed7edd22e0adc4fa21aea24;hp=4c344767dadf5c3514c2d2578c54fee8a637bce2;hpb=1f9ebd860bd0ee8e2371ee28160c09cde52c17d0;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/make/include/contrib.defs b/make/include/contrib.defs
index 4c344767..fcff2735 100644
--- a/make/include/contrib.defs
+++ b/make/include/contrib.defs
@@ -1,5 +1,5 @@
 CONTRIB.build/    = $(BUILD/)contrib/
-CONTRIB.download/ = $(PROJECT/)download/
+CONTRIB.download/ = $(SRC/)download/
 CONTRIB.host      = $(if $(filter 1,$(BUILD.cross)),$(BUILD.spec))
 
 ###############################################################################
@@ -17,7 +17,7 @@ define import.CONTRIB.defs
     ##
     ## common values useful across targets
     ##
-    $(1).src/   = $$(PROJECT/)contrib/$($(1).name)/
+    $(1).src/   = $$(SRC/)contrib/$($(1).name)/
     $(1).build/ = $$(CONTRIB.build/)$($(1).name)/
     $(1).deps   = $$(foreach n,$($(1).prerequisites),$$($$n.INSTALL.target))
 
@@ -34,7 +34,7 @@ define import.CONTRIB.defs
     ##
     ## target: extract
     ##
-    $(1).EXTRACT.tarbase = $$(patsubst %.tar.gz,%,$$(notdir $$($(1).FETCH.url)))
+    $(1).EXTRACT.tarbase = $$(strip $$(foreach x,tar.bz2 tar.gz,$$(patsubst %.$$(x),%,$$(filter %.$$(x),$$(notdir $$($(1).FETCH.url))))))
     $(1).EXTRACT.dir/    = $$($(1).build/)$$($(1).EXTRACT.tarbase)/
     $(1).EXTRACT.target  = $$($(1).build/).stamp.extract
     define $(1).EXTRACT
@@ -52,7 +52,7 @@ define import.CONTRIB.defs
 
     # extra line feed is required
     define $(1).PATCH.item
-        $$(PATCH.exe) -t -p1 -d $$(1) < $$(2)
+        $$(PATCH.exe) -t -N -p1 -d $$(1) < $$(2)
 
     endef
 
@@ -83,11 +83,11 @@ define import.CONTRIB.defs
     $(1).CONFIGURE.args = !sete @dir !bootstrap !env !exe @host @prefix !deps !shared !static !extra
 
     $(1).CONFIGURE.env.CC       = CC=$$($(1).GCC.gcc)
-    $(1).CONFIGURE.env.CFLAGS   = CFLAGS="$$(call fn.ARGS,$(1).GCC,*archs)"
+    $(1).CONFIGURE.env.CFLAGS   = CFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra)"
     $(1).CONFIGURE.env.CXX      = CXX=$$($(1).GCC.gxx)
-    $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs)"
-    $(1).CONFIGURE.env.CPPFLAGS = CPPFLAGS="$$(call fn.ARGS,$(1).GCC,*archs)"
-    $(1).CONFIGURE.env.LDFLAGS  = LDFLAGS="$$(call fn.ARGS,$(1).GCC,*archs)"
+    $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra)"
+    $(1).CONFIGURE.env.CPPFLAGS = CPPFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra)"
+    $(1).CONFIGURE.env.LDFLAGS  = LDFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver)"
 
     $(1).CONFIGURE.env.args = !CC !CFLAGS !CXX !CXXFLAGS !CPPFLAGS !LDFLAGS
     $(1).CONFIGURE.env = $$(call fn.ARGS,$(1).CONFIGURE.env,$$($(1).CONFIGURE.env.args))
@@ -202,7 +202,6 @@ $$($(1).FETCH.target): | $$(dir $$($(1).FETCH.target))
 $($(1).name).extract: $$($(1).EXTRACT.target)
 
 $$($(1).EXTRACT.target): | $$(dir $$($(1).EXTRACT.target))
-$$($(1).EXTRACT.target): $$($(1).deps)
 $$($(1).EXTRACT.target): $$($(1).FETCH.target)
 	$$($(1).EXTRACT)
 
@@ -210,7 +209,7 @@ $($(1).name).extract.touch:
 	$$(TOUCH.exe) $$($(1).EXTRACT.target)
 
 $($(1).name).extract.untouch:
-	$$(RM.exe) $$($(1).EXTRACT.target)
+	$$(RM.exe) -f $$($(1).EXTRACT.target)
 
 ##
 ## target: patch
@@ -225,7 +224,7 @@ $($(1).name).patch.touch:
 	$$(TOUCH.exe) $$($(1).PATCH.target)
 
 $($(1).name).patch.untouch:
-	$$(RM.exe) $$($(1).PATCH.target)
+	$$(RM.exe) -f $$($(1).PATCH.target)
 
 ##
 ## target: configure
@@ -233,6 +232,7 @@ $($(1).name).patch.untouch:
 $($(1).name).configure: $$($(1).CONFIGURE.target)
 
 $$($(1).CONFIGURE.target): | $$(dir $$($(1).CONFIGURE.target))
+$$($(1).CONFIGURE.target): $$($(1).deps)
 $$($(1).CONFIGURE.target): $$($(1).PATCH.target)
 	$$($(1).CONFIGURE)
 
@@ -240,7 +240,7 @@ $($(1).name).configure.touch:
 	$$(TOUCH.exe) $$($(1).CONFIGURE.target)
 
 $($(1).name).configure.untouch:
-	$$(RM.exe) $$($(1).CONFIGURE.target)
+	$$(RM.exe) -f $$($(1).CONFIGURE.target)
 
 ##
 ## target: build
@@ -256,7 +256,7 @@ $($(1).name).build.touch:
 	$$(TOUCH.exe) $$($(1).BUILD.target)
 
 $($(1).name).build.untouch:
-	$$(RM.exe) $$($(1).BUILD.target)
+	$$(RM.exe) -f $$($(1).BUILD.target)
 
 ##
 ## target: install
@@ -271,7 +271,7 @@ $($(1).name).install.touch:
 	$$(TOUCH.exe) $$($(1).INSTALL.target)
 
 $($(1).name).install.untouch:
-	$$(RM.exe) $$($(1).INSTALL.target)
+	$$(RM.exe) -f $$($(1).INSTALL.target)
 
 ##
 ## target: uninstall