make/lib/Awt2dLibraries.gmk

*** 700,715 ****
          -D "JDK_INTERNAL_NAME=fontmanager" \
          -D "JDK_FTYPE=0x2L", \
      OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfontmanager, \
  ))
  
- $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
- 
- ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
-   $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS)
- endif
- 
  $(INSTALL_LIBRARIES_HERE)/$(call SHARED_LIBRARY,fontmanager): $(BUILD_LIBFONTMANAGER_TARGET)
          $(install-file)
          ifneq ($(FREETYPE_BUNDLE_LIB_PATH), )
            ifeq ($(OPENJDK_TARGET_OS), macosx)
              # If bundling freetype on macosx, we need to rewrite the rpath location
--- 700,709 ----
*** 719,729 ****
                  '@rpath/$(call SHARED_LIBRARY,freetype)' \
                  $@
            endif
          endif
  
! TARGETS += $(INSTALL_LIBRARIES_HERE)/$(call SHARED_LIBRARY,fontmanager)
  
  ################################################################################
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
    LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt
--- 713,731 ----
                  '@rpath/$(call SHARED_LIBRARY,freetype)' \
                  $@
            endif
          endif
  
! BUILD_LIBFONTMANAGER += $(INSTALL_LIBRARIES_HERE)/$(call SHARED_LIBRARY,fontmanager)
! 
! $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
! 
! ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
!   $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS)
! endif
! 
! TARGETS += $(BUILD_LIBFONTMANAGER)
  
  ################################################################################
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
    LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt