diff options
Diffstat (limited to 'pr/src/Makefile.in')
| -rw-r--r-- | pr/src/Makefile.in | 64 |
1 files changed, 20 insertions, 44 deletions
diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in index 3514ab16..60445c7e 100644 --- a/pr/src/Makefile.in +++ b/pr/src/Makefile.in @@ -1,39 +1,7 @@ # -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is the Netscape Portable Runtime (NSPR). -# -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 1998-2000 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. #! gmake @@ -156,7 +124,12 @@ endif ifeq ($(OS_ARCH),Linux) ifeq ($(USE_PTHREADS), 1) +ifeq ($(OS_TARGET),Android) +# Android has no libpthread.so in NDK +OS_LIBS = -ldl +else OS_LIBS = -lpthread -ldl +endif else OS_LIBS = -ldl endif @@ -205,12 +178,12 @@ ifeq ($(OS_ARCH),WINCE) OS_LIBS = ws2.lib endif -ifeq ($(OS_TARGET),MacOSX) -OS_LIBS = -framework CoreServices -framework CoreFoundation +ifeq ($(OS_TARGET),Android) +OS_LIBS += -llog endif -ifdef GC_LEAK_DETECTOR -EXTRA_LIBS = -L$(dist_libdir) -lboehm +ifeq ($(OS_TARGET),MacOSX) +OS_LIBS = -framework CoreServices -framework CoreFoundation endif EXTRA_LIBS += $(OS_LIBS) @@ -309,10 +282,6 @@ OBJS += \ cplus/$(OBJDIR)/rctime.$(OBJ_SUFFIX) endif -ifdef GC_LEAK_DETECTOR -OBJS += memory/$(OBJDIR)/prgcleak.$(OBJ_SUFFIX) -endif - ifeq ($(OS_ARCH), WINNT) RES=$(OBJDIR)/nspr.res RESNAME=nspr.rc @@ -384,12 +353,19 @@ endif # +# We use a 'build' target here to ensure that we build $(TARGETS) after +# looping over $(DIRS) to create the object files in a parallel build. +# Recipe commands are executed sequentially in a parallel build while +# target dependencies are executed in parallel. +export:: + $(MAKE) build + # # The Client build wants the shared libraries in $(dist_bindir) # so we also install them there. # -export:: $(TARGETS) +build:: $(TARGETS) $(INSTALL) -m 444 $(TARGETS) $(dist_libdir) ifdef SHARED_LIBRARY ifeq ($(OS_ARCH),HP-UX) |