make/lib/Lib-java.desktop.gmk

*** 27,39 ****
  
  # Hook to include the corresponding custom file, if present.
  $(eval $(call IncludeCustomExtension, lib/Lib-java.desktop.gmk))
  
  # Prepare the find cache.
! LIB_java.desktop_SRC_DIRS += $(TOPDIR)/src/java.desktop/*/native
! 
! $(eval $(call FillCacheFind, $(wildcard $(LIB_java.desktop_SRC_DIRS))))
  
  ################################################################################
  # Create the AWT/2D libraries
  
  include Awt2dLibraries.gmk
--- 27,37 ----
  
  # Hook to include the corresponding custom file, if present.
  $(eval $(call IncludeCustomExtension, lib/Lib-java.desktop.gmk))
  
  # Prepare the find cache.
! $(eval $(call FillCacheFind, $(wildcard $(TOPDIR)/src/java.desktop/*/native)))
  
  ################################################################################
  # Create the AWT/2D libraries
  
  include Awt2dLibraries.gmk
*** 41,60 ****
  ################################################################################
  # Create the libjsound library
  
  ifneq ($(OPENJDK_TARGET_OS), aix)
  
-   LIBJSOUND_SRC_DIRS := $(wildcard \
-       $(TOPDIR)/src/java.desktop/share/native/libjsound \
-       $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libjsound \
-       )
- 
    LIBJSOUND_CFLAGS := \
-       -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
        $(ALSA_CFLAGS) \
-       $(LIBJAVA_HEADER_FLAGS) \
-       $(foreach dir, $(LIBJSOUND_SRC_DIRS), -I$(dir)) \
        -DX_PLATFORM=X_$(OPENJDK_TARGET_OS_UPPERCASE) \
        -DUSE_PORTS=TRUE \
        -DUSE_DAUDIO=TRUE \
        #
  
--- 39,50 ----
*** 69,79 ****
      LIBJSOUND_TOOLCHAIN := TOOLCHAIN_LINK_CXX
    endif
  
    $(eval $(call SetupJdkLibrary, BUILD_LIBJSOUND, \
        NAME := jsound, \
-       SRC := $(LIBJSOUND_SRC_DIRS), \
        TOOLCHAIN := $(LIBJSOUND_TOOLCHAIN), \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKLIB) \
            $(LIBJSOUND_CFLAGS), \
        CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \
--- 59,68 ----
*** 95,113 ****
  
  ################################################################################
  # Create the macosx specific osxapp and osx libraries
  
  ifeq ($(OPENJDK_TARGET_OS), macosx)
-   LIBOSXAPP_SRC := $(TOPDIR)/src/java.desktop/macosx/native/libosxapp
  
    $(eval $(call SetupJdkLibrary, BUILD_LIBOSXAPP, \
        NAME := osxapp, \
-       SRC := $(LIBOSXAPP_SRC), \
        OPTIMIZATION := LOW, \
!       CFLAGS := $(CFLAGS_JDKLIB) \
!           $(addprefix -I, $(LIBOSXAPP_SRC)) \
!           -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
        DISABLED_WARNINGS_clang := objc-method-access objc-root-class \
            deprecated-declarations, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
        LIBS := \
--- 84,98 ----
  
  ################################################################################
  # Create the macosx specific osxapp and osx libraries
  
  ifeq ($(OPENJDK_TARGET_OS), macosx)
  
    $(eval $(call SetupJdkLibrary, BUILD_LIBOSXAPP, \
        NAME := osxapp, \
        OPTIMIZATION := LOW, \
!       CFLAGS := $(CFLAGS_JDKLIB), \
        DISABLED_WARNINGS_clang := objc-method-access objc-root-class \
            deprecated-declarations, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
        LIBS := \
*** 127,149 ****
  
    TARGETS += $(BUILD_LIBOSXAPP)
  
    ##############################################################################
  
-   LIBOSX_DIRS := $(TOPDIR)/src/java.desktop/macosx/native/libosx
-   LIBOSX_CFLAGS := -I$(LIBOSX_DIRS) \
-       -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp \
-       $(LIBJAVA_HEADER_FLAGS) \
-       -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
-       #
- 
    $(eval $(call SetupJdkLibrary, BUILD_LIBOSX, \
        NAME := osx, \
-       SRC := $(LIBOSX_DIRS), \
        OPTIMIZATION := LOW, \
!       CFLAGS := $(CFLAGS_JDKLIB) \
!           $(LIBOSX_CFLAGS), \
        DISABLED_WARNINGS_clang := deprecated-declarations, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.desktop \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
        LIBS := \
--- 112,126 ----
  
    TARGETS += $(BUILD_LIBOSXAPP)
  
    ##############################################################################
  
    $(eval $(call SetupJdkLibrary, BUILD_LIBOSX, \
        NAME := osx, \
        OPTIMIZATION := LOW, \
!       CFLAGS := $(CFLAGS_JDKLIB), \
!       EXTRA_HEADER_DIRS := libosxapp, \
        DISABLED_WARNINGS_clang := deprecated-declarations, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.desktop \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
        LIBS := \