make/lib/SecurityLibraries.gmk

*** 126,149 ****
      BUILD_LIBKRB5_LIBS := advapi32.lib Secur32.lib netapi32.lib kernel32.lib user32.lib \
          gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib \
          ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib
    else ifeq ($(OPENJDK_TARGET_OS), macosx)
      BUILD_LIBKRB5_NAME := osxkrb5
!     BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/share/native/sun/security/krb5
!     BUILD_LIBKRB5_LIBS := -framework Kerberos
    endif
  
    ifneq ($(BUILD_LIBKRB5_NAME), )
      $(eval $(call SetupNativeCompilation,BUILD_LIBKRB5, \
          LIBRARY := $(BUILD_LIBKRB5_NAME), \
          OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
          SRC := $(BUILD_LIBKRB5_SRC), \
          LANG := C, \
          OPTIMIZATION := LOW, \
          CFLAGS := $(CFLAGS_JDKLIB) \
!             -I$(JDK_TOPDIR)/src/share/native/sun/security/krb5 \
!             -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/krb5, \
          LDFLAGS := $(LDFLAGS_JDKLIB) \
              $(call SET_SHARED_LIBRARY_ORIGIN), \
          LDFLAGS_SUFFIX := $(BUILD_LIBKRB5_LIBS), \
          VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
          RC_FLAGS := $(RC_FLAGS) \
--- 126,155 ----
      BUILD_LIBKRB5_LIBS := advapi32.lib Secur32.lib netapi32.lib kernel32.lib user32.lib \
          gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib \
          ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib
    else ifeq ($(OPENJDK_TARGET_OS), macosx)
      BUILD_LIBKRB5_NAME := osxkrb5
!     BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/share/native/sun/security/krb5 \
!         $(JDK_TOPDIR)/src/macosx/native/sun/security/krb5
!     BUILD_LIBKRB5_LIBS := -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
!         -framework JavaNativeFoundation \
!         -framework Cocoa \
!         -framework SystemConfiguration \
!         -framework Kerberos
    endif
  
    ifneq ($(BUILD_LIBKRB5_NAME), )
      $(eval $(call SetupNativeCompilation,BUILD_LIBKRB5, \
          LIBRARY := $(BUILD_LIBKRB5_NAME), \
          OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
          SRC := $(BUILD_LIBKRB5_SRC), \
          LANG := C, \
          OPTIMIZATION := LOW, \
          CFLAGS := $(CFLAGS_JDKLIB) \
!             -I$(JDK_TOPDIR)/src/share/native/sun/security/krb5, \
!         CFLAGS_windows := -I$(JDK_TOPDIR)/src/windows/native/sun/security/krb5, \
!         CFLAGS_macosx := -F/System/Library/Frameworks/JavaVM.framework/Frameworks, \
          LDFLAGS := $(LDFLAGS_JDKLIB) \
              $(call SET_SHARED_LIBRARY_ORIGIN), \
          LDFLAGS_SUFFIX := $(BUILD_LIBKRB5_LIBS), \
          VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
          RC_FLAGS := $(RC_FLAGS) \