make/lib/Lib-java.security.jgss.gmk

*** 38,57 ****
        SRC := $(LIBJ2GSS_SRC), \
        LANG := C, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJ2GSS_SRC)) \
            $(LIBJAVA_HEADER_FLAGS) \
!           -I$(JDK_OUTPUTDIR)/gensrc_headers/java.security.jgss, \
        MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2gss/mapfile-vers, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
        LDFLAGS_SUFFIX := $(LIBDL), \
        LDFLAGS_SUFFIX_solaris := -lc, \
!       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2gss, \
        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  
!   SECURITY_KERBEROS_LIBRARIES += $(BUILD_LIBJ2GSS)
  endif
  
  ################################################################################
  
  ifneq ($(BUILD_CRYPTO), no)
--- 38,57 ----
        SRC := $(LIBJ2GSS_SRC), \
        LANG := C, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJ2GSS_SRC)) \
            $(LIBJAVA_HEADER_FLAGS) \
!           -I$(SUPPORT_OUTPUTDIR)/headers/java.security.jgss, \
        MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2gss/mapfile-vers, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
        LDFLAGS_SUFFIX := $(LIBDL), \
        LDFLAGS_SUFFIX_solaris := -lc, \
!       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libj2gss, \
        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  
!   TARGETS += $(BUILD_LIBJ2GSS)
  endif
  
  ################################################################################
  
  ifneq ($(BUILD_CRYPTO), no)
*** 79,106 ****
          SRC := $(BUILD_LIBKRB5_SRC), \
          LANG := C, \
          OPTIMIZATION := LOW, \
          CFLAGS := $(CFLAGS_JDKLIB) \
              $(addprefix -I, $(BUILD_LIBKRB5_SRC)) \
!             -I$(JDK_OUTPUTDIR)/gensrc_headers/java.security.jgss, \
          LDFLAGS := $(LDFLAGS_JDKLIB) \
              $(call SET_SHARED_LIBRARY_ORIGIN), \
          LDFLAGS_SUFFIX := $(BUILD_LIBKRB5_LIBS), \
          VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
          RC_FLAGS := $(RC_FLAGS) \
              -D "JDK_FNAME=$(BUILD_LIBKRB5_NAME).dll" \
              -D "JDK_INTERNAL_NAME=$(BUILD_LIBKRB5_NAME)" \
              -D "JDK_FTYPE=0x2L", \
!         OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libkrb5, \
          DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  
!     SECURITY_KERBEROS_LIBRARIES += $(BUILD_LIBKRB5)
    endif
  endif
  
  ################################################################################
- 
- java.security.jgss: $(SECURITY_KERBEROS_LIBRARIES)
- 
- all: java.security.jgss
- 
- .PHONY: all java.security.jgss
--- 79,100 ----
          SRC := $(BUILD_LIBKRB5_SRC), \
          LANG := C, \
          OPTIMIZATION := LOW, \
          CFLAGS := $(CFLAGS_JDKLIB) \
              $(addprefix -I, $(BUILD_LIBKRB5_SRC)) \
!             -I$(SUPPORT_OUTPUTDIR)/headers/java.security.jgss, \
          LDFLAGS := $(LDFLAGS_JDKLIB) \
              $(call SET_SHARED_LIBRARY_ORIGIN), \
          LDFLAGS_SUFFIX := $(BUILD_LIBKRB5_LIBS), \
          VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
          RC_FLAGS := $(RC_FLAGS) \
              -D "JDK_FNAME=$(BUILD_LIBKRB5_NAME).dll" \
              -D "JDK_INTERNAL_NAME=$(BUILD_LIBKRB5_NAME)" \
              -D "JDK_FTYPE=0x2L", \
!         OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libkrb5, \
          DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  
!     TARGETS += $(BUILD_LIBKRB5)
    endif
  endif
  
  ################################################################################