X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fmodule.rules;h=09a8c34c79f9653a6a1a55717c5e41289f026031;hb=d7389faafa327bb1be3340c34c30f353a8f52960;hp=e7d93e752c90fe9078e200c8381c263cd3ed34fa;hpb=b57073fe5dd4505339ac08e0a9a6635a5f2ded3e;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/module.rules b/gtk/module.rules
index e7d93e75..09a8c34c 100644
--- a/gtk/module.rules
+++ b/gtk/module.rules
@@ -5,7 +5,7 @@ install: gtk.install
 install-strip: gtk.install-strip
 uninstall: gtk.uninstall
 clean: hgtk.clean gtk.clean
-xclean: hgtk.clean gtk.xclean
+xclean: gtk.xclean
 
 gtk.configure: $(GTK.CONFIGURE.stamp)
 
@@ -13,22 +13,13 @@ $(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/)
@@ -44,10 +35,10 @@ gtk.install:
 gtk.uninstall:
 	$(MAKE) -C $(GTK.build/) uninstall
 
-gtk.clean:
+gtk.clean: hgtk.clean
 	$(MAKE) -C $(GTK.build/) clean
 
-gtk.xclean:
+gtk.xclean: hgtk.clean
 	$(MAKE) -C $(GTK.build/) distclean
 	$(RM.exe) -f $(GTK.out)
 	$(RM.exe) -fr $(GTK.build/)
@@ -55,36 +46,20 @@ gtk.xclean:
 ###############################################################################
 ###############################################################################
 $(eval $(call import.MODULE.rules,HGTK))
-
-hgtk.build: $(CREATE_RES.exe) $(WIDGETDEPS.exe) $(QUOTESTRING.exe)
-
+ 
+hgtk.build: $(CREATE_RES.exe)
+ 
 $(CREATE_RES.exe): | $(dir $(CREATE_RES.exe))
 $(CREATE_RES.exe): $(CREATE_RES.c.o) $(HGTKCOMMON.c.o)
 	$(call HGTK.GCC.EXE,$@,$^)
-
+ 
 $(HGTKCOMMON.c.o): | $(dir $(HGTKCOMMON.c.o))
 $(HGTKCOMMON.c.o): $(BUILD/)%-native.o: $(SRC/)%.c
 	$(call HGTK.GCC.C_O,$@,$<)
-
+ 
 $(CREATE_RES.c.o): | $(dir $(CREATE_RES.c.o))
 $(CREATE_RES.c.o): $(BUILD/)%-native.o: $(SRC/)%.c
 	$(call HGTK.GCC.C_O,$@,$<)
-
-$(WIDGETDEPS.exe): | $(dir $(WIDGETDEPS.exe))
-$(WIDGETDEPS.exe): $(WIDGETDEPS.c.o) $(HGTKCOMMON.c.o)
-	$(call HGTK.GCC.EXE,$@,$^)
-
-$(WIDGETDEPS.c.o): | $(dir $(WIDGETDEPS.c.o))
-$(WIDGETDEPS.c.o): $(BUILD/)%-native.o: $(SRC/)%.c
-	$(call HGTK.GCC.C_O,$@,$<)
-
-$(QUOTESTRING.c.o): | $(dir $(QUOTESTRING.c.o))
-$(QUOTESTRING.c.o): $(BUILD/)%-native.o: $(SRC/)%.c
-	$(call HGTK.GCC.C_O,$@,$<)
-
-$(QUOTESTRING.exe): | $(dir $(QUOTESTRING.exe))
-$(QUOTESTRING.exe): $(QUOTESTRING.c.o)
-	$(call HGTK.GCC.EXE,$@,$^)
-
+ 
 hgtk.clean:
 	$(RM.exe) -f $(HGTK.out)