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

diff --git a/gtk/module.rules b/gtk/module.rules
index 657a2030..a1c1eb76 100644
--- a/gtk/module.rules
+++ b/gtk/module.rules
@@ -1,10 +1,11 @@
 $(eval $(call import.MODULE.rules,GTK))
 
-build: hgtk.build gtk.build
+build: gtk.build
 install: gtk.install
+install-strip: gtk.install-strip
 uninstall: gtk.uninstall
-clean: hgtk.clean gtk.clean
-xclean: hgtk.clean gtk.xclean
+clean: gtk.clean
+xclean: gtk.xclean
 
 gtk.configure: $(GTK.CONFIGURE.stamp)
 
@@ -12,31 +13,25 @@ $(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:
+gtk.install-strip:
 	$(MAKE) -C $(GTK.build/) prefix=$(PREFIX) install-strip
 
+gtk.install:
+	$(MAKE) -C $(GTK.build/) prefix=$(PREFIX) install
+
 gtk.uninstall:
 	$(MAKE) -C $(GTK.build/) uninstall
 
@@ -48,39 +43,3 @@ gtk.xclean:
 	$(RM.exe) -f $(GTK.out)
 	$(RM.exe) -fr $(GTK.build/)
 
-###############################################################################
-###############################################################################
-$(eval $(call import.MODULE.rules,HGTK))
-
-hgtk.build: $(CREATE_RES.exe) $(WIDGETDEPS.exe) $(QUOTESTRING.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)