X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fmodule.rules;h=138fe64a63a7f85afbbffffc150daed44be06286;hb=4f0019f03c2e85e8634150ff0c9a31bee6d35ce5;hp=c5de20ea8bed0919ad494dabe7615a93311a82ff;hpb=62168c045749afd733e8d88ec07827e6e2907337;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/module.rules b/gtk/module.rules
index c5de20ea..138fe64a 100644
--- a/gtk/module.rules
+++ b/gtk/module.rules
@@ -2,6 +2,7 @@ $(eval $(call import.MODULE.rules,GTK))
 
 build: hgtk.build gtk.build
 install: gtk.install
+install-strip: gtk.install-strip
 uninstall: gtk.uninstall
 clean: hgtk.clean gtk.clean
 xclean: hgtk.clean gtk.xclean
@@ -12,28 +13,22 @@ $(GTK.CONFIGURE.stamp): | $(dir $(GTK.CONFIGURE.stamp))
 $(GTK.CONFIGURE.stamp): $(GTK.src/)Makefile.am
 $(GTK.CONFIGURE.stamp): $(GTK.src/)configure.ac $(GTK.src/)src/Makefile.am
 	set -e; cd $(GTK.src/); NOCONFIGURE=1 ./autogen.sh
-ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
 	set -e; cd $(GTK.build/); $(call fn.ABSOLUTE,$(GTK.src/))configure \
-		--host=$(BUILD.spec) \
+		$(GTK.CONFIGURE.extra) \
 		PKG_CONFIG_PATH=$(BUILD/)contrib/lib/pkgconfig \
 	    CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O *D ?extra)" \
 	    LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O) " \
 	    --prefix=$(PREFIX) \
 	    --with-hb=$(call fn.ABSOLUTE,$(BUILD/))
-else
-	set -e; cd $(GTK.build/); $(call fn.ABSOLUTE,$(GTK.src/))configure \
-		PKG_CONFIG_PATH=$(BUILD/)contrib/lib/pkgconfig \
-	    CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O ?extra)" \
-	    LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O)" \
-	    --prefix=$(PREFIX) \
-	    --with-hb=$(call fn.ABSOLUTE,$(BUILD/))
-endif
 	$(TOUCH.exe) $@
 
 gtk.build: | $(GTK.build/)
 gtk.build: $(GTK.CONFIGURE.stamp) $(LIBHB.a)
 	+$(MAKE) -C $(GTK.build/)
 
+gtk.install-strip:
+	$(MAKE) -C $(GTK.build/) prefix=$(PREFIX) install-strip
+
 gtk.install:
 	$(MAKE) -C $(GTK.build/) prefix=$(PREFIX) install