diff options
| author | Taylor Hutt <thutt@chromium.org> | 2012-02-23 09:33:34 -0800 |
|---|---|---|
| committer | Taylor Hutt <thutt@chromium.org> | 2012-02-23 11:00:13 -0800 |
| commit | bbca6ef87327e7c83b6b9763061c774aa9fdfcf8 (patch) | |
| tree | 12aa26c284d44ff1983d3c6bd47194e2ea2147fb /defs | |
| parent | 822e137ab10b578727f92a7df8b562f39d0562dd (diff) | |
| download | adhd-bbca6ef87327e7c83b6b9763061c774aa9fdfcf8.tar.gz | |
ADHD: Incorporate 'cras' to build process
Details
Modify the ADHD build process to build & install cras.
The ADHD ebuild is having two separate changes applied:
o include prerequisite of 'speex'
o install being rewritten to use ADHD build 'install' target
This change does the following:
- Makefile
Added rules to call to the 'cras' build & install.
Also added a little verbosity to the installation of system
files.
o cras/Makefile.am, cras/configure.ac, cras/git_prepare.sh
Added copyright header.
o cras/cras.mk
A small Makefile called by the master Makefile. This file
has two targets: 'cras' and 'cras_install'; the former builds
cras, while the later installs into DESTDIR.
BUG=chromium-os:19558
TEST=See above.
Change-Id: I65c50bf87e2130774196a6e0b2ad2a58dfada707
Signed-off-by: Taylor Hutt <thutt@chromium.org>
Diffstat (limited to 'defs')
| -rw-r--r-- | defs/make.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/defs/make.mk b/defs/make.mk index 9d87fa75..68369d84 100644 --- a/defs/make.mk +++ b/defs/make.mk @@ -29,10 +29,10 @@ mkdir = [ ! -d $(1) ] && \ # then build the first argument by recursively invoking make. # The recursive make is performed in the build directory. # -# $(call remake,<label>,<subdirectory>,<target>) +# $(call remake,<label>,<subdirectory>,<makefile>,<target>) # -# ex: @$(call remake,Building,gavd,gavd) -# $(1) $(2) $(3) +# ex: @$(call remake,Building,gavd,Makefile,gavd) +# $(1) $(2) $(3) $(4) # # REL_DIR: # @@ -61,9 +61,9 @@ remake = \ $(call mkdir,$(ADHD_BUILD_DIR)/$${REL_DIR}) && \ $(MESSAGE) "$(1) $${REL_DIR}"; \ $(MAKE) $(SILENT) \ - -f $(ADHD_DIR)/$${REL_DIR}/Makefile \ + -f $(ADHD_DIR)/$${REL_DIR}/$(3) \ -C $(ADHD_BUILD_DIR)/$${REL_DIR} \ VPATH=$(ADHD_DIR)/$${REL_DIR} \ ADHD_SOURCE_DIR=$(ADHD_DIR)/$${REL_DIR} \ THIS_BUILD_DIR=$(ADHD_BUILD_DIR)/$${REL_DIR} \ - $(3)) + $(4)) |