make/copy/Copy-java.desktop.gmk

*** 27,37 ****
  
  $(eval $(call IncludeCustomExtension, jdk, copy/Copy-java.desktop.gmk))
  
  ################################################################################
  
! JAVA_DESKTOP_HEADERS := \
      $(INCLUDE_DST_DIR)/jawt.h \
      $(INCLUDE_DST_OS_DIR)/jawt_md.h \
      #
  
  $(INCLUDE_DST_DIR)/%.h: $(JDK_TOPDIR)/src/java.desktop/share/native/include/%.h
--- 27,37 ----
  
  $(eval $(call IncludeCustomExtension, jdk, copy/Copy-java.desktop.gmk))
  
  ################################################################################
  
! TARGETS += \
      $(INCLUDE_DST_DIR)/jawt.h \
      $(INCLUDE_DST_OS_DIR)/jawt_md.h \
      #
  
  $(INCLUDE_DST_DIR)/%.h: $(JDK_TOPDIR)/src/java.desktop/share/native/include/%.h
*** 60,90 ****
    # on windows only
    #
    #TODO: rework this to avoid hardcoding library name in the makefile
    #
    ifeq ($(OPENJDK_TARGET_OS), windows)
!     FREETYPE_TARGET_LIB := $(JDK_OUTPUTDIR)/bin/$(call SHARED_LIBRARY,freetype)
    else
!     FREETYPE_TARGET_LIB := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6
    endif
  
    # We can't use $(install-file) in this rule because it preserves symbolic links and
    # libfreetype.so is usually a symbolic link to something like libfreetype.so.6 on Unix.
    $(FREETYPE_TARGET_LIB): $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype)
          $(MKDIR) -p $(@D)
          $(CP) $< $@
          ifeq ($(OPENJDK_BUILD_OS), windows)
            $(CHMOD) +rx $@
          endif
  endif
  
  ################################################################################
  
! $(JDK_OUTPUTDIR)/lib/sound.properties: $(JDK_TOPDIR)/src/java.desktop/share/conf/sound.properties
          $(call install-file)
  
! DESKTOP_CONF_FILES += $(JDK_OUTPUTDIR)/lib/sound.properties
  
  ################################################################################
  #
  # Copy property files from sun/print to LIB_DST_DIR
  #
--- 60,92 ----
    # on windows only
    #
    #TODO: rework this to avoid hardcoding library name in the makefile
    #
    ifeq ($(OPENJDK_TARGET_OS), windows)
!     FREETYPE_TARGET_LIB := $(LIB_DST_DIR)/$(call SHARED_LIBRARY,freetype)
    else
!     FREETYPE_TARGET_LIB := $(LIB_DST_DIR)$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6
    endif
  
    # We can't use $(install-file) in this rule because it preserves symbolic links and
    # libfreetype.so is usually a symbolic link to something like libfreetype.so.6 on Unix.
    $(FREETYPE_TARGET_LIB): $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype)
          $(MKDIR) -p $(@D)
          $(CP) $< $@
          ifeq ($(OPENJDK_BUILD_OS), windows)
            $(CHMOD) +rx $@
          endif
+ 
+   TARGETS += $(FREETYPE_TARGET_LIB)
  endif
  
  ################################################################################
  
! $(CONF_DST_DIR)/sound.properties: $(JDK_TOPDIR)/src/java.desktop/share/conf/sound.properties
          $(call install-file)
  
! TARGETS += $(CONF_DST_DIR)/sound.properties
  
  ################################################################################
  #
  # Copy property files from sun/print to LIB_DST_DIR
  #
*** 93,103 ****
  PSFONTPROPFILE_TARGET_FILES := $(subst $(PSFONTPROPFILE_SRC_DIR),$(LIB_DST_DIR),$(PSFONTPROPFILE_SRCS))
  
  $(LIB_DST_DIR)/%: $(PSFONTPROPFILE_SRC_DIR)/%
          $(call install-file)
  
! DESKTOP_CONF_FILES += $(PSFONTPROPFILE_TARGET_FILES)
  
  ################################################################################
  #
  # Copy cursor.properties and cursors gif files to LIB_DST_DIR
  #
--- 95,105 ----
  PSFONTPROPFILE_TARGET_FILES := $(subst $(PSFONTPROPFILE_SRC_DIR),$(LIB_DST_DIR),$(PSFONTPROPFILE_SRCS))
  
  $(LIB_DST_DIR)/%: $(PSFONTPROPFILE_SRC_DIR)/%
          $(call install-file)
  
! TARGETS += $(PSFONTPROPFILE_TARGET_FILES)
  
  ################################################################################
  #
  # Copy cursor.properties and cursors gif files to LIB_DST_DIR
  #
*** 111,121 ****
  CURSORS_OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/conf/images/cursors
  
  $(CURSORS_DEST_DIR)/cursors.properties: $(CURSORS_OPENJDK_TARGET_OS_LIB_SRC)/cursors.properties
          $(call install-file)
  
! DESKTOP_CONF_FILES += $(CURSORS_DEST_DIR)/cursors.properties
  
  CURSORS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/share/conf/images/cursors
  ifeq ($(OPENJDK_TARGET_OS), windows)
    CURSORS_SRC_FILES := $(CURSORS_LIB_SRC)/invalid32x32.gif $(wildcard $(CURSORS_LIB_SRC)/win32_*.gif)
  else # OPENJDK_TARGET_OS
--- 113,123 ----
  CURSORS_OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/conf/images/cursors
  
  $(CURSORS_DEST_DIR)/cursors.properties: $(CURSORS_OPENJDK_TARGET_OS_LIB_SRC)/cursors.properties
          $(call install-file)
  
! TARGETS += $(CURSORS_DEST_DIR)/cursors.properties
  
  CURSORS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/share/conf/images/cursors
  ifeq ($(OPENJDK_TARGET_OS), windows)
    CURSORS_SRC_FILES := $(CURSORS_LIB_SRC)/invalid32x32.gif $(wildcard $(CURSORS_LIB_SRC)/win32_*.gif)
  else # OPENJDK_TARGET_OS
*** 124,137 ****
  CURSORS_TARGET_FILES := $(subst $(CURSORS_LIB_SRC),$(CURSORS_DEST_DIR),$(CURSORS_SRC_FILES))
  
  $(CURSORS_DEST_DIR)/%: $(CURSORS_LIB_SRC)/%
          $(call install-file)
  
! DESKTOP_CONF_FILES += $(CURSORS_TARGET_FILES)
  
  ################################################################################
- 
- java.desktop: $(DESKTOP_CONF_FILES) $(FREETYPE_TARGET_LIB) $(JAVA_DESKTOP_HEADERS)
- 
- all: java.desktop
- 
- .PHONY: all java.desktop
--- 126,133 ----
  CURSORS_TARGET_FILES := $(subst $(CURSORS_LIB_SRC),$(CURSORS_DEST_DIR),$(CURSORS_SRC_FILES))
  
  $(CURSORS_DEST_DIR)/%: $(CURSORS_LIB_SRC)/%
          $(call install-file)
  
! TARGETS += $(CURSORS_TARGET_FILES)
  
  ################################################################################