jdk/make/lib/SecurityLibraries.gmk
author ddehaven
Wed, 18 Jun 2014 12:52:14 -0700
changeset 25086 f5f41ed620d5
parent 22951 5fd21112b2b6
permissions -rw-r--r--
8043340: [macosx] Fix hard-wired paths to JavaVM.framework Summary: Build system tweaks to allow building with Xcode 5 and on OS X 10.9 and later Reviewed-by: erikj, henryjen, dholmes
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     1
#
25086
f5f41ed620d5 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 22951
diff changeset
     2
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     4
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    10
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    15
# accompanied this code).
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    16
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    20
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    23
# questions.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    24
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    25
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    26
LIBJAAS_MAPFILE :=
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    27
ifneq ($(OPENJDK_TARGET_OS), solaris)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    28
  LIBJAAS_EXCLUDE_FILES := Solaris.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    29
else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    30
  # only on solaris...wonder why
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 20896
diff changeset
    31
  LIBJAAS_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjaas/mapfile-vers
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    32
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    33
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    34
LIBJAAS_NAME := jaas_unix
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    35
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    36
  LIBJAAS_NAME := jaas_nt
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    37
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    38
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    39
$(eval $(call SetupNativeCompilation,BUILD_LIBJAAS, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    40
    LIBRARY := $(LIBJAAS_NAME), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    41
    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    42
    SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/security/auth/module, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    43
    LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    44
    OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    45
    CFLAGS := $(CFLAGS_JDKLIB), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    46
    MAPFILE := $(LIBJAAS_MAPFILE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    47
    LDFLAGS := $(filter-out -ljava, $(LDFLAGS_JDKLIB)) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    48
        $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    49
    LDFLAGS_windows := netapi32.lib user32.lib mpr.lib advapi32.lib, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    50
    LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    51
    LDFLAGS_SUFFIX_solaris := -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    52
    EXCLUDE_FILES := $(LIBJAAS_EXCLUDE_FILES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    53
    VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    54
    RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    55
        -D "JDK_FNAME=$(LIBJAAS_NAME).dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    56
        -D "JDK_INTERNAL_NAME=$(LIBJAAS_NAME)" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    57
        -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    58
    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjaas, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    59
    DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    60
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    61
$(BUILD_LIBJAAS): $(BUILD_LIBJAVA)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    62
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    63
BUILD_LIBRARIES += $(BUILD_LIBJAAS)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    64
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    65
##########################################################################################
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    66
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    67
$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PCSC, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    68
    LIBRARY := j2pcsc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    69
    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    70
    SRC := $(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    71
        $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    72
    LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    73
    CFLAGS_posix := -D__sun_jdk, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    74
    OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    75
    CFLAGS := $(CFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    76
        -I$(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    77
        -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    78
        -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio/MUSCLE, \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 20896
diff changeset
    79
    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2pcsc/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    80
    LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    81
        $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    82
    LDFLAGS_SUFFIX_posix := $(LIBDL), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    83
    LDFLAGS_SUFFIX_windows := winscard.lib, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    84
    LDFLAGS_SUFFIX_solaris := -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    85
    VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    86
    RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    87
        -D "JDK_FNAME=j2pcsc.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    88
        -D "JDK_INTERNAL_NAME=j2pcsc" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    89
        -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    90
    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2pcsc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    91
    DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    92
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    93
BUILD_LIBRARIES += $(BUILD_LIBJ2PCSC)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    94
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    95
##########################################################################################
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    96
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    97
ifneq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    98
  $(eval $(call SetupNativeCompilation,BUILD_LIBJ2GSS, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    99
      LIBRARY := j2gss, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   100
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   101
      SRC := $(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   102
          $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   103
      LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   104
      OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   105
      CFLAGS := $(CFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   106
          -I$(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   107
          -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper, \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 20896
diff changeset
   108
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2gss/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   109
      LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   110
          $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   111
      LDFLAGS_SUFFIX := $(LIBDL), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   112
      LDFLAGS_SUFFIX_solaris := -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   113
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2gss, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   114
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   115
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   116
  BUILD_LIBRARIES += $(BUILD_LIBJ2GSS)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   117
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   118
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   119
##########################################################################################
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   120
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   121
ifneq ($(BUILD_CRYPTO), no)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   122
  BUILD_LIBKRB5_NAME :=
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   123
  ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   124
    BUILD_LIBKRB5_NAME := w2k_lsa_auth
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   125
    BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/krb5
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   126
    BUILD_LIBKRB5_LIBS := advapi32.lib Secur32.lib netapi32.lib kernel32.lib user32.lib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   127
        gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   128
        ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   129
  else ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   130
    BUILD_LIBKRB5_NAME := osxkrb5
22951
5fd21112b2b6 8034043: Native methods for preferences API should not be in libjava
alanb
parents: 22607
diff changeset
   131
    BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/share/native/sun/security/krb5 \
5fd21112b2b6 8034043: Native methods for preferences API should not be in libjava
alanb
parents: 22607
diff changeset
   132
        $(JDK_TOPDIR)/src/macosx/native/sun/security/krb5
25086
f5f41ed620d5 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 22951
diff changeset
   133
    BUILD_LIBKRB5_LIBS := \
22951
5fd21112b2b6 8034043: Native methods for preferences API should not be in libjava
alanb
parents: 22607
diff changeset
   134
        -framework JavaNativeFoundation \
5fd21112b2b6 8034043: Native methods for preferences API should not be in libjava
alanb
parents: 22607
diff changeset
   135
        -framework Cocoa \
5fd21112b2b6 8034043: Native methods for preferences API should not be in libjava
alanb
parents: 22607
diff changeset
   136
        -framework SystemConfiguration \
5fd21112b2b6 8034043: Native methods for preferences API should not be in libjava
alanb
parents: 22607
diff changeset
   137
        -framework Kerberos
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   138
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   139
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   140
  ifneq ($(BUILD_LIBKRB5_NAME), )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   141
    $(eval $(call SetupNativeCompilation,BUILD_LIBKRB5, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   142
        LIBRARY := $(BUILD_LIBKRB5_NAME), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   143
        OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   144
        SRC := $(BUILD_LIBKRB5_SRC), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   145
        LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   146
        OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   147
        CFLAGS := $(CFLAGS_JDKLIB) \
22951
5fd21112b2b6 8034043: Native methods for preferences API should not be in libjava
alanb
parents: 22607
diff changeset
   148
            -I$(JDK_TOPDIR)/src/share/native/sun/security/krb5, \
5fd21112b2b6 8034043: Native methods for preferences API should not be in libjava
alanb
parents: 22607
diff changeset
   149
        CFLAGS_windows := -I$(JDK_TOPDIR)/src/windows/native/sun/security/krb5, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   150
        LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   151
            $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   152
        LDFLAGS_SUFFIX := $(BUILD_LIBKRB5_LIBS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   153
        VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   154
        RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   155
            -D "JDK_FNAME=$(BUILD_LIBKRB5_NAME).dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   156
            -D "JDK_INTERNAL_NAME=$(BUILD_LIBKRB5_NAME)" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   157
            -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   158
        OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libkrb5, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   159
        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   160
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   161
    BUILD_LIBRARIES += $(BUILD_LIBKRB5)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   162
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   163
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   164
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   165
##########################################################################################
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   166
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   167
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   168
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   169
  $(eval $(call SetupNativeCompilation,BUILD_LIBSUNMSCAPI, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   170
      LIBRARY := sunmscapi, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   171
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   172
      SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   173
      LANG := C++, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   174
      OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   175
      CFLAGS := $(CFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   176
          -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   177
      LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   178
          $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   179
      LDFLAGS_SUFFIX := Crypt32.Lib advapi32.lib, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   180
      VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   181
      RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   182
          -D "JDK_FNAME=sunmscapi.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   183
          -D "JDK_INTERNAL_NAME=sunmscapi" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   184
          -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   185
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunmscapi, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   186
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   187
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   188
  BUILD_LIBRARIES += $(BUILD_LIBSUNMSCAPI)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   189
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   190
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   191
##########################################################################################
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   192
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   193
$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PKCS11, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   194
    LIBRARY := j2pkcs11, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   195
    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   196
    SRC := $(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   197
        $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   198
        $(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   199
        $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   200
    LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   201
    OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   202
    CFLAGS := $(CFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   203
        -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   204
        -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   205
        -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   206
        -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper, \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 20896
diff changeset
   207
    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2pkcs11/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   208
    LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   209
        $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   210
    LDFLAGS_SUFFIX_posix := $(LIBDL), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   211
    LDFLAGS_SUFFIX_solaris := -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   212
    VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   213
    RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   214
        -D "JDK_FNAME=j2pkcs11.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   215
        -D "JDK_INTERNAL_NAME=j2pkcs11" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   216
        -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   217
    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2pkcs11, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   218
    DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   219
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   220
BUILD_LIBRARIES += $(BUILD_LIBJ2PKCS11)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   221
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   222
##########################################################################################
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   223
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   224
ifeq ($(ENABLE_INTREE_EC), yes)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   225
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   226
  BUILD_LIBSUNEC_FLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/security/ec \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   227
      -I$(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   228
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   229
  #
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   230
  # On sol-sparc...all libraries are compiled with -xregs=no%appl
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   231
  # (set in CFLAGS_REQUIRED_sparc)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   232
  #
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   233
  # except!!! libsunec.so
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   234
  #
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   235
  ECC_JNI_SOLSPARC_FILTER :=
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   236
  ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   237
    ECC_JNI_SOLSPARC_FILTER := -xregs=no%appl
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   238
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   239
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   240
  $(eval $(call SetupNativeCompilation,BUILD_LIBSUNEC, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   241
      LIBRARY := sunec, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   242
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   243
      SRC := $(JDK_TOPDIR)/src/share/native/sun/security/ec \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   244
          $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   245
      LANG := C++, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   246
      OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   247
      CFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB)) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   248
          $(BUILD_LIBSUNEC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   249
          -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   250
      CXXFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   251
          $(BUILD_LIBSUNEC_FLAGS), \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 20896
diff changeset
   252
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsunec/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   253
      LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   254
      LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   255
      LDFLAGS_SUFFIX := $(LIBCXX), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   256
      LDFLAGS_SUFFIX_linux := -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   257
      LDFLAGS_SUFFIX_solaris := -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   258
      VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   259
      RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   260
          -D "JDK_FNAME=sunec.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   261
          -D "JDK_INTERNAL_NAME=sunec" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   262
          -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   263
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunec, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   264
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   265
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   266
  BUILD_LIBRARIES += $(BUILD_LIBSUNEC)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   267
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   268
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   269
##########################################################################################
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   270
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   271
ifeq ($(OPENJDK_TARGET_OS), solaris)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   272
  ifndef OPENJDK
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   273
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   274
    $(eval $(call SetupNativeCompilation,BUILD_LIBJ2UCRYPTO, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   275
        LIBRARY := j2ucrypto, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   276
        OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   277
        SRC := $(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   278
        LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   279
        OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   280
        CFLAGS := $(CFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   281
            -I$(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto, \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 20896
diff changeset
   282
        MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2ucrypto/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   283
        LDFLAGS := $(LDFLAGS_JDKLIB), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   284
        LDFLAGS_SUFFIX := $(LIBDL), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   285
        LDFLAGS_SUFFIX_solaris := -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   286
        OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2ucrypto, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   287
        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   288
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   289
    $(BUILD_LIBJ2UCRYPTO): $(BUILD_LIBJAVA)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   290
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   291
    BUILD_LIBRARIES += $(BUILD_LIBJ2UCRYPTO)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   292
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   293
  endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   294
endif