diff options
author | konablend <[email protected]> | 2009-03-01 17:03:11 +0000 |
---|---|---|
committer | konablend <[email protected]> | 2009-03-01 17:03:11 +0000 |
commit | 4dbce6b69967c1e14092637aa95b6c31855a81fc (patch) | |
tree | 516c17095967698eeb419c70ce72dbd2c11bf754 /gtk | |
parent | c47939541ccec1e5e57753b16b28baed2613f586 (diff) |
BuildSystem: conversion from jam-based to make-based system.
KNOWN ISSUES:
1. OSX + Xcode builds do not support parallel builds; attempting to
use them may cause unbounded number of jobs. However, disabling
via configure --disable-xcode avoids the issue.
2. OSX ppc binary produces binary which has audio-scan problems.
3. OSX ppc64 binary has not been runtime tested.
ADDED:
00-BuildUserGuide.txt
contrib/*/module.*
doc/
make/
libhb/module.*
test/module.*
macos/module.*
gtk/module.*
DROPPED:
BUILD
BuildContribDarwin.sh
DownloadMacOsXContribBinaries.sh
Jamfile
Jamrules
MacOsXContribBinariesVersion.txt
Makefile
Makefile.config
jam
libhb/Jamefile
libhb/Makefile
test/BUILDSHARED
test/Makefile
contrib/Jamfile
contrib/Makefile
contrib/patch-ffmpeg.patch
contrib/patch-x264-idr.patch
contrib/patch-x264-linux.patch
RENAMED:
contrib/*.patch -> contrib/MODULE/[AP]??-*.patch
macosx/HandBrake.plist -> macosx/Info.plist
MODIFIED: libhb/decavcodec.c
Patched to use cleaner include "libavcodec/audioconvert".
Second part to support this cleanup is ffmpeg A02-audioconvert.patch .
MODIFIED: libhb/hb.c
MODIFIED: libhb/hb.h
MODIFIED: libhb/muxmkv.c
MODIFIED: libhb/muxmp4.c
MODIFIED: libhb/update.c
Patched to use "project.h" for project metadata.
Renamed HB_BUILD -> HB_PROJECT_BUILD.
Renamed HB_VERSION -> HB_PROJECT_VERSION.
MODIFIED: test/test.c:
Patched HandBrakeCLI to support I/O on Mac OS X ZFS filesystems.
Reference r1803 as similar patch for HandBrake.app .
Unpatched behavior is crash/buserror when using ZFS.
MODIFIED: macosx/Growl.framework/
Upgraded 0.7.6 (i386,ppc) -> 1.1.2 (i386,x86_64,ppc,ppc64).
New architectures facilitate x86_64 and ppc64 builds.
MODIFIED: macosx/HandBrake.xcodeproj/
Bumped compatibilty mode from 2.4 -> 3.1 .
Dumped old configurations Deployment, Developer.
Added configurations standard, sebug as replacements.
Added standard.i386, standard.x86_64, standard.ppc, standard.ppc64 .
for explicit architecture build.
All configurations settings cleaned up and normalized.
Build output directories adjusted to support new build system.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2180 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/INSTALL | 5 | ||||
-rw-r--r-- | gtk/module.defs | 14 | ||||
-rw-r--r-- | gtk/module.rules | 34 |
3 files changed, 52 insertions, 1 deletions
diff --git a/gtk/INSTALL b/gtk/INSTALL index 5458714e1..d3c5b40a9 100644 --- a/gtk/INSTALL +++ b/gtk/INSTALL @@ -2,7 +2,7 @@ Installation Instructions ************************* Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006 Free Software Foundation, Inc. +2006, 2007 Free Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -67,6 +67,9 @@ The simplest way to compile this package is: all sorts of other programs in order to regenerate files that came with the distribution. + 6. Often, you can also type `make uninstall' to remove the installed + files again. + Compilers and Options ===================== diff --git a/gtk/module.defs b/gtk/module.defs new file mode 100644 index 000000000..d3b86310e --- /dev/null +++ b/gtk/module.defs @@ -0,0 +1,14 @@ +$(eval $(call import.MODULE.defs,GTK,gtk,LIBHB)) + +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 new file mode 100644 index 000000000..3cc655923 --- /dev/null +++ b/gtk/module.rules @@ -0,0 +1,34 @@ +$(eval $(call import.MODULE.rules,GTK)) + +build: gtk.build +clean: gtk.clean + +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 \ + --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) + +$(MAKE) -C $(GTK.build/) + $(TOUCH.exe) $@ + +gtk.install: + $(MAKE) -C $(GTK.build/) install-strip + +gtk.uninstall: + $(MAKE) -C $(GTK.build/) uninstall + +gtk.clean: + $(MAKE) -C $(GTK.build/) clean + $(RM.exe) $(GTK.BUILD.stamp) + +gtk.xclean: + $(RM.exe) -f $(GTK.out) + $(RM.exe) -fr $(GTK.build/) |