← Back to branch summary

~ubuntu-branches/ubuntu/karmic/nss/karmic-updates

« back to all changes in this revision

Viewing changes to mozilla/security/coreconf/arch.mk

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack
  • Date: 2009-06-16 13:23:47 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20090616132347-311ysb8oep74b98y
Tags: 3.12.3-0ubuntu1
https://launchpad.net/bugs/387751
* new upstream release 3.12.3 RTM (NSS_3_12_3_RTM) (LP: #387751)
* adjust patches to changed upstream code base
  - update debian/patches/38_kbsd.patch
* needs nspr >= 4.7.4
  - update debian/control
* update 85_security_load.patch to latest debian version
  - update debian/patches/85_security_load.patch
* add new symbols for 3.12.3
  - update debian/libnss3-1d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/coreconf/arch.mk
183
183
# at lesser performance (the Win95 target uses threads; the WinNT target
184
184
# uses fibers).
185
185
#
186
 
# When OS_TARGET=WIN16 is specified, then a Windows 3.11 (16bit) target
187
 
# is built. See: win16_3.11.mk for lots more about the Win16 target.
188
 
#
189
186
# If OS_TARGET is not specified, it defaults to $(OS_ARCH), i.e., no
190
187
# cross-compilation.
191
188
#
298
295
    OS_RELEASE = 4.0
299
296
endif
300
297
 
301
 
ifeq ($(OS_TARGET), WIN16)
302
 
    OS_RELEASE =
303
 
#   OS_RELEASE = _3.11
304
 
endif
305
 
 
306
298
ifdef OS_TARGET_RELEASE
307
299
    OS_RELEASE = $(OS_TARGET_RELEASE)
308
300
endif
319
311
#
320
312
 
321
313
ifdef BUILD_OPT
322
 
    ifeq ($(OS_TARGET),WIN16)
323
 
        OBJDIR_TAG = _O
324
 
    else
325
 
        OBJDIR_TAG = $(64BIT_TAG)_OPT
326
 
    endif
 
314
    OBJDIR_TAG = $(64BIT_TAG)_OPT
327
315
else
328
316
    ifdef BUILD_IDG
329
 
        ifeq ($(OS_TARGET),WIN16)
330
 
            OBJDIR_TAG = _I
331
 
        else
332
 
            OBJDIR_TAG = $(64BIT_TAG)_IDG
333
 
        endif
 
317
        OBJDIR_TAG = $(64BIT_TAG)_IDG
334
318
    else
335
 
        ifeq ($(OS_TARGET),WIN16)
336
 
            OBJDIR_TAG = _D
337
 
        else
338
 
            OBJDIR_TAG = $(64BIT_TAG)_DBG
339
 
        endif
 
319
        OBJDIR_TAG = $(64BIT_TAG)_DBG
340
320
    endif
341
321
endif
342
322
 
351
331
 
352
332
OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ
353
333
 
354
 
ifeq (,$(filter-out WINNT WIN95 WINCE,$(OS_TARGET))) # list omits WIN16
 
334
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
355
335
ifndef BUILD_OPT
356
336
#
357
337
# Define USE_DEBUG_RTL if you want to use the debug runtime library