diff options
| author | jstebbins <[email protected]> | 2009-03-01 20:49:30 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2009-03-01 20:49:30 +0000 |
| commit | c5c52e5c71acd2b4a88bcf674bc30fd20611f476 (patch) | |
| tree | 1c01e685fbc2b4802e75c54abd5d44fd93679b54 /gtk | |
| parent | dc202093832299fb42383b18e0da795c398aeecf (diff) | |
LinGui: force invocation of gtk.build for every build so gtk make
can check all its dependencies
fix typo in about dialog
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2186 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/module.defs | 2 | ||||
| -rw-r--r-- | gtk/module.rules | 8 | ||||
| -rw-r--r-- | gtk/src/ghb.ui | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/gtk/module.defs b/gtk/module.defs index f72249b5e..ed46be53b 100644 --- a/gtk/module.defs +++ b/gtk/module.defs @@ -5,11 +5,9 @@ GTK.src/ = $(PROJECT/)gtk/ GTK.build/ = $(BUILD/)gtk/ GTK.CONFIGURE.stamp = $(GTK.build/).stamp.configure -GTK.BUILD.stamp = $(GTK.build/).stamp.build ############################################################################### GTK.out += $(GTK.CONFIGURE.stamp) -GTK.out += $(GTK.BUILD.stamp) BUILD.out += $(GTK.out) diff --git a/gtk/module.rules b/gtk/module.rules index 6c197199d..f7ce07045 100644 --- a/gtk/module.rules +++ b/gtk/module.rules @@ -6,8 +6,6 @@ xclean: gtk.xclean gtk.configure: $(GTK.CONFIGURE.stamp) -gtk.build: $(GTK.BUILD.stamp) - $(GTK.CONFIGURE.stamp): | $(dir $(GTK.CONFIGURE.stamp)) set -e; cd $(GTK.src/); NOCONFIGURE=1 ./autogen.sh set -e; cd $(GTK.build/); $(call fn.ABSOLUTE,$(GTK.src/))configure \ @@ -17,11 +15,9 @@ $(GTK.CONFIGURE.stamp): | $(dir $(GTK.CONFIGURE.stamp)) --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) +$(MAKE) -C $(GTK.build/) - $(TOUCH.exe) $@ gtk.install: $(MAKE) -C $(GTK.build/) install-strip diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui index 7cc27df59..06d3e8a99 100644 --- a/gtk/src/ghb.ui +++ b/gtk/src/ghb.ui @@ -5033,7 +5033,7 @@ location as the movie.</property> <property name="program_name">HandBrake</property> <property name="version">0.9.2</property> <property name="copyright" translatable="yes">Copyright © 2008 John Stebbins -Copyright © Copyright © 2004 - 2008, HandBrake Devs</property> +Copyright © 2004 - 2008, HandBrake Devs</property> <property name="comments" translatable="yes">HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.</property> <property name="website">http://handbrake.fr</property> <property name="website_label" translatable="yes">http://handbrake.fr</property> |