Remove the set cpu count option as it doesn't do anything now

[handbrake-jp/handbrake-jp-git.git] / gtk / module.rules

diff --git a/gtk/module.rules b/gtk/module.rules
index 215c877..a1c1eb7 100644 (file)
--- a/gtk/module.rules
+++ b/gtk/module.rules
@@ -1,38 +1,45 @@
 $(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.build: $(GTK.BUILD.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)" \
-               --with-hb=$(call fn.ABSOLUTE,$(BUILD/))
+               $(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) $@
 
-$(GTK.BUILD.stamp): $(LIBHB.a)
-$(GTK.BUILD.stamp): | $(dir $(GTK.BUILD.stamp))
-$(GTK.BUILD.stamp): $(GTK.CONFIGURE.stamp)
+gtk.build: | $(GTK.build/)
+gtk.build: $(GTK.CONFIGURE.stamp) $(LIBHB.a)
        +$(MAKE) -C $(GTK.build/)
-       $(TOUCH.exe) $@
+
+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
 
 gtk.clean:
        $(MAKE) -C $(GTK.build/) clean
-       $(RM.exe) $(GTK.BUILD.stamp)
 
 gtk.xclean:
        $(MAKE) -C $(GTK.build/) distclean
        $(RM.exe) -f $(GTK.out)
        $(RM.exe) -fr $(GTK.build/)
+