jdk/make/java/java/Makefile

Print this page

        

@@ -156,10 +156,11 @@
 vpath %.c $(SHARE_SRC)/native/org/openjdk/jigsaw
 vpath %.c $(PLATFORM_SRC)/native/common
 vpath %.c $(PLATFORM_SRC)/native/java/util
 vpath %.c $(PLATFORM_SRC)/native/sun/security/provider
 vpath %.c $(PLATFORM_SRC)/native/sun/io
+vpath %.c $(PLATFORM_SRC)/native/org/openjdk/jigsaw
 
 #
 # Includes the fdlibm header file.
 #
 OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/lang/fdlibm/include

@@ -174,10 +175,28 @@
 # Also include the TimeZone_md.h header file.
 #
 OTHER_INCLUDES += -I$(PLATFORM_SRC)/native/java/util
 
 #
+# Also include the PersistentTreeMap, and possibly the BDB header, files.
+#
+OTHER_INCLUDES += -I$(SHARE_SRC)/native/org/openjdk/jigsaw
+ifeq ($(PLATFORM), windows)
+    OTHER_INCLUDES += -I$(GENNATIVESRCDIR)/bdb
+else
+  BDB_LIB_NAME=
+  ifdef USE_SYSTEM_BDB
+    BDB_LIB_NAME=libdb.$(LIBRARY_SUFFIX)
+    OTHER_INCLUDES += -I$(BDB_HEADERS_PATH)
+  else
+    BDB_LIB_NAME=libdb-rds.$(LIBRARY_SUFFIX)
+    OTHER_INCLUDES += -I$(GENNATIVESRCDIR)/bdb
+  endif
+  OTHER_CFLAGS += -DBDB_LIB_NAME='"$(BDB_LIB_NAME)"'
+endif
+
+#
 # Is the altzone extern documented in ctime(3C) available?
 #
 ifneq ($(PLATFORM), windows)
 ifneq ($(PLATFORM), macosx)
 HAVE_ALTZONE=true

@@ -215,12 +234,12 @@
 #
 # What to link?
 # On Windows, shell32 is not normally required and so it is delay loaded.
 #
 ifeq ($(PLATFORM),windows)
-OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \
-                       -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib \
+OTHER_LDLIBS += ws2_32.lib $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) \
+                fdlibm.lib -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib \
                        shell32.lib delayimp.lib /DELAYLOAD:shell32.dll
 else
 OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) $(LIBNSL) $(LIBSCF) $(LIBDL) \
                 -L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH)
 ifeq ($(PLATFORM), macosx)