make/lib/SoundLibraries.gmk

*** 1,7 ****
  #
! # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 26,36 ****
  LIBJSOUND_SRC_DIRS := \
      $(JDK_TOPDIR)/src/java.desktop/share/native/libjsound \
      $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjsound \
      #
  LIBJSOUND_CFLAGS := \
!     -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
      $(LIBJAVA_HEADER_FLAGS) \
      $(foreach dir, $(LIBJSOUND_SRC_DIRS), -I$(dir)) \
      #
  
  LIBJSOUND_SRC_FILES := Utilities.c Platform.c
--- 26,36 ----
  LIBJSOUND_SRC_DIRS := \
      $(JDK_TOPDIR)/src/java.desktop/share/native/libjsound \
      $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjsound \
      #
  LIBJSOUND_CFLAGS := \
!     -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
      $(LIBJAVA_HEADER_FLAGS) \
      $(foreach dir, $(LIBJSOUND_SRC_DIRS), -I$(dir)) \
      #
  
  LIBJSOUND_SRC_FILES := Utilities.c Platform.c
*** 170,185 ****
      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
      RC_FLAGS := $(RC_FLAGS) \
          -D "JDK_FNAME=jsound.dll" \
          -D "JDK_INTERNAL_NAME=jsound" \
          -D "JDK_FTYPE=0x2L", \
!     OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsound, \
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  
  $(BUILD_LIBJSOUND): $(BUILD_LIBJAVA)
  
! DESKTOP_LIBRARIES += $(BUILD_LIBJSOUND)
  
  ##########################################################################################
  
  ifneq ($(filter jsoundalsa, $(EXTRA_SOUND_JNI_LIBS)), )
  
--- 170,185 ----
      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
      RC_FLAGS := $(RC_FLAGS) \
          -D "JDK_FNAME=jsound.dll" \
          -D "JDK_INTERNAL_NAME=jsound" \
          -D "JDK_FTYPE=0x2L", \
!     OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjsound, \
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  
  $(BUILD_LIBJSOUND): $(BUILD_LIBJAVA)
  
! TARGETS += $(BUILD_LIBJSOUND)
  
  ##########################################################################################
  
  ifneq ($(filter jsoundalsa, $(EXTRA_SOUND_JNI_LIBS)), )
  
*** 206,221 ****
            -DUSE_PLATFORM_MIDI_IN=TRUE, \
        MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsoundalsa/mapfile-vers, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
        LDFLAGS_SUFFIX := $(ALSA_LIBS) -ljava -ljvm, \
!       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundalsa, \
        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  
    $(BUILD_LIBJSOUNDALSA): $(BUILD_LIBJAVA)
  
!   DESKTOP_LIBRARIES += $(BUILD_LIBJSOUNDALSA)
  
  endif
  
  ##########################################################################################
  
--- 206,221 ----
            -DUSE_PLATFORM_MIDI_IN=TRUE, \
        MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsoundalsa/mapfile-vers, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
        LDFLAGS_SUFFIX := $(ALSA_LIBS) -ljava -ljvm, \
!       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjsoundalsa, \
        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  
    $(BUILD_LIBJSOUNDALSA): $(BUILD_LIBJAVA)
  
!   TARGETS += $(BUILD_LIBJSOUNDALSA)
  
  endif
  
  ##########################################################################################
  
*** 238,250 ****
        VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
        RC_FLAGS := $(RC_FLAGS) \
            -D "JDK_FNAME=jsoundds.dll" \
            -D "JDK_INTERNAL_NAME=jsoundds" \
            -D "JDK_FTYPE=0x2L", \
!       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundds, \
        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  
    $(BUILD_LIBJSOUNDDS): $(BUILD_LIBJAVA)
  
!   DESKTOP_LIBRARIES += $(BUILD_LIBJSOUNDDS)
  
  endif
--- 238,250 ----
        VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
        RC_FLAGS := $(RC_FLAGS) \
            -D "JDK_FNAME=jsoundds.dll" \
            -D "JDK_INTERNAL_NAME=jsoundds" \
            -D "JDK_FTYPE=0x2L", \
!       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjsoundds, \
        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  
    $(BUILD_LIBJSOUNDDS): $(BUILD_LIBJAVA)
  
!   TARGETS += $(BUILD_LIBJSOUNDDS)
  
  endif