Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Side by Side Diff: Makefile

Issue 11885025: Allow re-targeting of naclports install (Closed) Base URL: http://naclports.googlecode.com/svn/trunk/src
Patch Set: rebase Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | build_tools/common.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Native Client Authors. All rights reserved. 1 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 # 4 #
5 # Makefile 5 # Makefile
6 # 6 #
7 # usage: 'make [package]' 7 # usage: 'make [package]'
8 # 8 #
9 # This makefile builds all of the Native Client packages listed below 9 # This makefile builds all of the Native Client packages listed below
10 # in $(PACKAGES). Each package has a dependency on its own sentinel 10 # in $(PACKAGES). Each package has a dependency on its own sentinel
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 ifeq ($(NACL_GLIBC), 1) 44 ifeq ($(NACL_GLIBC), 1)
45 NACL_TOOLCHAIN_ROOT = $(NACL_SDK_ROOT)/toolchain/$(OS_SUBDIR)_x86_glibc 45 NACL_TOOLCHAIN_ROOT = $(NACL_SDK_ROOT)/toolchain/$(OS_SUBDIR)_x86_glibc
46 NACL_LIBC = glibc 46 NACL_LIBC = glibc
47 else 47 else
48 NACL_TOOLCHAIN_ROOT = $(NACL_SDK_ROOT)/toolchain/$(OS_SUBDIR)_x86_newlib 48 NACL_TOOLCHAIN_ROOT = $(NACL_SDK_ROOT)/toolchain/$(OS_SUBDIR)_x86_newlib
49 NACL_LIBC = newlib 49 NACL_LIBC = newlib
50 endif 50 endif
51 endif 51 endif
52 52
53 NACL_OUT = out 53 NACL_OUT = out
54 NACLPORTS_PREFIX ?= $(NACL_TOOLCHAIN_ROOT)/$(NACL_ARCH)-nacl/usr
55
54 NACL_DIRS_BASE = $(NACL_OUT)/tarballs \ 56 NACL_DIRS_BASE = $(NACL_OUT)/tarballs \
55 $(NACL_OUT)/repository-$(NACL_ARCH) \ 57 $(NACL_OUT)/repository-$(NACL_ARCH) \
56 $(NACL_OUT)/publish 58 $(NACL_OUT)/publish \
57 59 » » $(NACLPORTS_PREFIX)
58 NACL_SDK_USR = $(NACL_TOOLCHAIN_ROOT)/$(NACL_ARCH)-nacl/usr
59 60
60 NACL_DIRS_TO_REMOVE = $(NACL_OUT) \ 61 NACL_DIRS_TO_REMOVE = $(NACL_OUT) \
61 » » $(NACL_SDK_USR) \ 62 » » $(NACLPORTS_PREFIX) \
62 63
63 NACL_DIRS_TO_MAKE = $(NACL_DIRS_BASE) \ 64 NACL_DIRS_TO_MAKE = $(NACL_DIRS_BASE) \
64 » » $(NACL_SDK_USR)/include \ 65 » » $(NACLPORTS_PREFIX)/include \
65 » » $(NACL_SDK_USR)/lib 66 » » $(NACLPORTS_PREFIX)/lib
66 67
67 LIBRARIES = \ 68 LIBRARIES = \
68 libraries/nacl-mounts \ 69 libraries/nacl-mounts \
69 libraries/SDL-1.2.14 \ 70 libraries/SDL-1.2.14 \
70 libraries/SDL_mixer-1.2.11 \ 71 libraries/SDL_mixer-1.2.11 \
71 libraries/SDL_image-1.2.10 \ 72 libraries/SDL_image-1.2.10 \
72 libraries/SDL_ttf-2.0.10 \ 73 libraries/SDL_ttf-2.0.10 \
73 libraries/gc6.8 \ 74 libraries/gc6.8 \
74 libraries/fftw-3.2.2 \ 75 libraries/fftw-3.2.2 \
75 libraries/libtommath-0.41 \ 76 libraries/libtommath-0.41 \
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 # PNACL 286 # PNACL
286 ###################################################################### 287 ######################################################################
287 # Libraries and Examples should work for PNaCl, but if new examples 288 # Libraries and Examples should work for PNaCl, but if new examples
288 # do not work, you can filter them here. 289 # do not work, you can filter them here.
289 WORKS_FOR_PNACL=$(LIBRARIES) $(EXAMPLES) 290 WORKS_FOR_PNACL=$(LIBRARIES) $(EXAMPLES)
290 291
291 works_for_pnacl: $(WORKS_FOR_PNACL) 292 works_for_pnacl: $(WORKS_FOR_PNACL)
292 293
293 works_for_pnacl_list: 294 works_for_pnacl_list:
294 @echo $(WORKS_FOR_PNACL) 295 @echo $(WORKS_FOR_PNACL)
OLDNEW
« no previous file with comments | « no previous file | build_tools/common.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698