X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fmodule.rules;h=a1c1eb76f58b0f2c15ba26a9e827677d3b1c308d;hb=4b72a63eb61a01275493c4bfb51ba02152d1c5e1;hp=8cea29f375db4d3fc6955fdb38d84920129d52da;hpb=86bec131f585eff61acc1d1d3eb5952e20b6b968;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/module.rules b/gtk/module.rules
index 8cea29f3..a1c1eb76 100644
--- a/gtk/module.rules
+++ b/gtk/module.rules
@@ -2,17 +2,23 @@ $(eval $(call import.MODULE.rules,GTK))
 
 build: gtk.build
 install: gtk.install
+install-strip: gtk.install-strip
+uninstall: gtk.uninstall
 clean: gtk.clean
 xclean: gtk.xclean
 
 gtk.configure: $(GTK.CONFIGURE.stamp)
 
 $(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
 	set -e; cd $(GTK.build/); $(call fn.ABSOLUTE,$(GTK.src/))configure \
-	    CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O)" \
-	    LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O)" \
-	    --prefix=$(INSTALL.prefix) \
+		$(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/))
 	$(TOUCH.exe) $@
 
@@ -20,8 +26,11 @@ 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/) install-strip
+	$(MAKE) -C $(GTK.build/) prefix=$(PREFIX) install
 
 gtk.uninstall:
 	$(MAKE) -C $(GTK.build/) uninstall
@@ -33,3 +42,4 @@ gtk.xclean:
 	$(MAKE) -C $(GTK.build/) distclean
 	$(RM.exe) -f $(GTK.out)
 	$(RM.exe) -fr $(GTK.build/)
+