equal
deleted
inserted
replaced
36 BUILDDIR = ../.. |
36 BUILDDIR = ../.. |
37 SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true |
37 SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true |
38 SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true |
38 SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true |
39 include $(BUILDDIR)/common/Defs.gmk |
39 include $(BUILDDIR)/common/Defs.gmk |
40 |
40 |
41 # build sun/security/jgss/wrapper on non-windows platform |
41 # build sun/security/jgss/wrapper on non-windows non-macosx platforms |
42 JGSS_WRAPPER = |
42 JGSS_WRAPPER = |
43 ifneq ($(PLATFORM), windows) |
43 ifneq ($(PLATFORM), windows) |
44 JGSS_WRAPPER = jgss/wrapper |
44 ifneq ($(PLATFORM), macosx) |
|
45 JGSS_WRAPPER = jgss/wrapper |
|
46 endif |
45 endif |
47 endif |
46 |
48 |
47 # Build PKCS#11 on all platforms |
49 # Build PKCS#11 on all platforms |
48 PKCS11 = pkcs11 |
50 PKCS11 = pkcs11 |
49 |
51 |