jdk/makefiles/CompileNativeLibraries.gmk
changeset 17448 c93083bb7f29
parent 17435 ec797e955dca
parent 17213 7fe77eacbf83
child 17734 e16be5d4f043
child 17673 33e311ad099a
equal deleted inserted replaced
17444:54975dfb824a 17448:c93083bb7f29
    61 WIN_AWT_LIB := $(JDK_OUTPUTDIR)/objs/libawt/awt.lib
    61 WIN_AWT_LIB := $(JDK_OUTPUTDIR)/objs/libawt/awt.lib
    62 
    62 
    63 # Use this variable to set DEBUG_SYMBOLS true on windows for all libraries, but
    63 # Use this variable to set DEBUG_SYMBOLS true on windows for all libraries, but
    64 # not on other platforms.
    64 # not on other platforms.
    65 ifeq ($(OPENJDK_TARGET_OS), windows)
    65 ifeq ($(OPENJDK_TARGET_OS), windows)
    66     WINDOWS_ONLY := true
    66     DEBUG_ALL_BINARIES := true
       
    67 endif
       
    68 
       
    69 # Build everything with debugging on OpenJDK
       
    70 ifdef OPENJDK
       
    71     DEBUG_ALL_BINARIES := true
    67 endif
    72 endif
    68 
    73 
    69 #
    74 #
    70 # TODO replace with X_FLAGS / X_LIBS
    75 # TODO replace with X_FLAGS / X_LIBS
    71 #   and add them to configure
    76 #   and add them to configure
    89 		OPTIMIZATION:=$(BUILD_LIBFDLIBM_OPTIMIZATION), \
    94 		OPTIMIZATION:=$(BUILD_LIBFDLIBM_OPTIMIZATION), \
    90 		CFLAGS:=$(CFLAGS_JDKLIB) \
    95 		CFLAGS:=$(CFLAGS_JDKLIB) \
    91 			-I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include,\
    96 			-I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include,\
    92 		CFLAGS_windows_debug:=-DLOGGING,\
    97 		CFLAGS_windows_debug:=-DLOGGING,\
    93 		ARFLAGS:=$(ARFLAGS),\
    98 		ARFLAGS:=$(ARFLAGS),\
    94 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libfdlibm))
    99 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libfdlibm,\
       
   100 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
    95 
   101 
    96 else
   102 else
    97 
   103 
    98 # On macosx the old build does partial (incremental) linking of fdlibm instead of
   104 # On macosx the old build does partial (incremental) linking of fdlibm instead of
    99 # a plain static library.
   105 # a plain static library.
   103                 SRC:=$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src,\
   109                 SRC:=$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src,\
   104 		LANG:=C,\
   110 		LANG:=C,\
   105 		CFLAGS:=$(CFLAGS_JDKLIB) \
   111 		CFLAGS:=$(CFLAGS_JDKLIB) \
   106 			-I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include,\
   112 			-I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include,\
   107 		LDFLAGS:=-nostdlib -r -arch x86_64,\
   113 		LDFLAGS:=-nostdlib -r -arch x86_64,\
   108 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libfdlibm))
   114 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libfdlibm,\
       
   115 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
   109 
   116 
   110 BUILD_LIBFDLIBM := $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX)
   117 BUILD_LIBFDLIBM := $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX)
   111 $(BUILD_LIBFDLIBM) : $(BUILD_LIBFDLIBM_MAC)
   118 $(BUILD_LIBFDLIBM) : $(BUILD_LIBFDLIBM_MAC)
   112 	$(call install-file)
   119 	$(call install-file)
   113 
   120 
   255 			  -D "JDK_FNAME=java.dll" \
   262 			  -D "JDK_FNAME=java.dll" \
   256 			  -D "JDK_INTERNAL_NAME=java" \
   263 			  -D "JDK_INTERNAL_NAME=java" \
   257 			  -D "JDK_FTYPE=0x2L",\
   264 			  -D "JDK_FTYPE=0x2L",\
   258 		REORDER:=$(LIBJAVA_REORDER), \
   265 		REORDER:=$(LIBJAVA_REORDER), \
   259 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjava,\
   266 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjava,\
   260 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
   267 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
   261 
   268 
   262 BUILD_LIBRARIES += $(BUILD_LIBJAVA)
   269 BUILD_LIBRARIES += $(BUILD_LIBJAVA)
   263 
   270 
   264 $(BUILD_LIBJAVA) : $(LIBJLI_BINARY)
   271 $(BUILD_LIBJAVA) : $(LIBJLI_BINARY)
   265 
   272 
   306 		RC_FLAGS:=$(RC_FLAGS)\
   313 		RC_FLAGS:=$(RC_FLAGS)\
   307 			  -D "JDK_FNAME=mlib_image.dll" \
   314 			  -D "JDK_FNAME=mlib_image.dll" \
   308 			  -D "JDK_INTERNAL_NAME=mlib_image" \
   315 			  -D "JDK_INTERNAL_NAME=mlib_image" \
   309 			  -D "JDK_FTYPE=0x2L",\
   316 			  -D "JDK_FTYPE=0x2L",\
   310 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libmlib_image,\
   317 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libmlib_image,\
   311 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
   318 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
   312 
   319 
   313 $(BUILD_LIBMLIB_IMAGE) : $(BUILD_LIBJAVA)
   320 $(BUILD_LIBMLIB_IMAGE) : $(BUILD_LIBJAVA)
   314 
   321 
   315 BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE)
   322 BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE)
   316 
   323 
   429 		MAPFILE:=$(BUILD_LIBMLIB_IMAGE_MAPFILE), \
   436 		MAPFILE:=$(BUILD_LIBMLIB_IMAGE_MAPFILE), \
   430 		LDFLAGS:=$(LDFLAGS_JDKLIB) \
   437 		LDFLAGS:=$(LDFLAGS_JDKLIB) \
   431                          $(BUILD_LIBMLIB_LDLIBS) -ljava -ljvm \
   438                          $(BUILD_LIBMLIB_LDLIBS) -ljava -ljvm \
   432 			 $(call SET_SHARED_LIBRARY_ORIGIN),\
   439 			 $(call SET_SHARED_LIBRARY_ORIGIN),\
   433 		LDFLAGS_SUFFIX_solaris:=-lc,\
   440 		LDFLAGS_SUFFIX_solaris:=-lc,\
   434 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libmlib_image_v))
   441 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libmlib_image_v,\
       
   442 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
   435 
   443 
   436 $(BUILD_LIBMLIB_IMAGE_V): $(BUILD_LIBJAVA)
   444 $(BUILD_LIBMLIB_IMAGE_V): $(BUILD_LIBJAVA)
   437 
   445 
   438 BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE_V)
   446 BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE_V)
   439 
   447 
   737 		RC_FLAGS:=$(RC_FLAGS) $(LIBAWT_RC_FLAGS) \
   745 		RC_FLAGS:=$(RC_FLAGS) $(LIBAWT_RC_FLAGS) \
   738 			  -D "JDK_FNAME=awt.dll" \
   746 			  -D "JDK_FNAME=awt.dll" \
   739 			  -D "JDK_INTERNAL_NAME=awt" \
   747 			  -D "JDK_INTERNAL_NAME=awt" \
   740 			  -D "JDK_FTYPE=0x2L",\
   748 			  -D "JDK_FTYPE=0x2L",\
   741 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt,\
   749 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt,\
   742 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
   750 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
   743 
   751 
   744 $(BUILD_LIBAWT) : $(BUILD_LIBJAVA)
   752 $(BUILD_LIBAWT) : $(BUILD_LIBJAVA)
   745 
   753 
   746 ifeq ($(OPENJDK_TARGET_OS), macosx)
   754 ifeq ($(OPENJDK_TARGET_OS), macosx)
   747 $(BUILD_LIBAWT) : $(BUILD_LIBMLIB_IMAGE)
   755 $(BUILD_LIBAWT) : $(BUILD_LIBMLIB_IMAGE)
   893 		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
   901 		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
   894 		RC_FLAGS:=$(RC_FLAGS)\
   902 		RC_FLAGS:=$(RC_FLAGS)\
   895 			  -D "JDK_FNAME=xawt.dll" \
   903 			  -D "JDK_FNAME=xawt.dll" \
   896 			  -D "JDK_INTERNAL_NAME=xawt" \
   904 			  -D "JDK_INTERNAL_NAME=xawt" \
   897 			  -D "JDK_FTYPE=0x2L",\
   905 			  -D "JDK_FTYPE=0x2L",\
   898 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt_xawt))
   906 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt_xawt,\
       
   907 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
   899 
   908 
   900 $(BUILD_LIBAWT_XAWT) : $(BUILD_LIBJAVA)
   909 $(BUILD_LIBAWT_XAWT) : $(BUILD_LIBJAVA)
   901 
   910 
   902 $(BUILD_LIBAWT_XAWT) : $(BUILD_LIBAWT)
   911 $(BUILD_LIBAWT_XAWT) : $(BUILD_LIBAWT)
   903 
   912 
   954 		RC_FLAGS:=$(RC_FLAGS)\
   963 		RC_FLAGS:=$(RC_FLAGS)\
   955 			  -D "JDK_FNAME=zip.dll" \
   964 			  -D "JDK_FNAME=zip.dll" \
   956 			  -D "JDK_INTERNAL_NAME=zip" \
   965 			  -D "JDK_INTERNAL_NAME=zip" \
   957 			  -D "JDK_FTYPE=0x2L",\
   966 			  -D "JDK_FTYPE=0x2L",\
   958 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libzip,\
   967 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libzip,\
   959 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
   968 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
   960 
   969 
   961 $(BUILD_LIBZIP) : $(BUILD_LIBJAVA)
   970 $(BUILD_LIBZIP) : $(BUILD_LIBJAVA)
   962 
   971 
   963 BUILD_LIBRARIES += $(BUILD_LIBZIP)
   972 BUILD_LIBRARIES += $(BUILD_LIBZIP)
   964 
   973 
   984 		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
   993 		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
   985 		RC_FLAGS:=$(RC_FLAGS)\
   994 		RC_FLAGS:=$(RC_FLAGS)\
   986 			  -D "JDK_FNAME=unpack.dll" \
   995 			  -D "JDK_FNAME=unpack.dll" \
   987 			  -D "JDK_INTERNAL_NAME=unpack" \
   996 			  -D "JDK_INTERNAL_NAME=unpack" \
   988 			  -D "JDK_FTYPE=0x2L",\
   997 			  -D "JDK_FTYPE=0x2L",\
   989 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
   998 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
   990 
   999 
   991 $(BUILD_LIBUNPACK) : $(BUILD_LIBJAVA)
  1000 $(BUILD_LIBUNPACK) : $(BUILD_LIBJAVA)
   992 
  1001 
   993 BUILD_LIBRARIES += $(BUILD_LIBUNPACK)
  1002 BUILD_LIBRARIES += $(BUILD_LIBUNPACK)
   994 
  1003 
  1098 		RC_FLAGS:=$(RC_FLAGS)\
  1107 		RC_FLAGS:=$(RC_FLAGS)\
  1099 			  -D "JDK_FNAME=dt_shmem.dll" \
  1108 			  -D "JDK_FNAME=dt_shmem.dll" \
  1100 			  -D "JDK_INTERNAL_NAME=dt_shmem" \
  1109 			  -D "JDK_INTERNAL_NAME=dt_shmem" \
  1101 			  -D "JDK_FTYPE=0x2L",\
  1110 			  -D "JDK_FTYPE=0x2L",\
  1102 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libdt_shmem,\
  1111 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libdt_shmem,\
  1103 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  1112 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  1104 
  1113 
  1105   BUILD_LIBRARIES += $(BUILD_LIBDT_SHMEM)
  1114   BUILD_LIBRARIES += $(BUILD_LIBDT_SHMEM)
  1106 
  1115 
  1107 endif # OPENJDK_TARGET_OS
  1116 endif # OPENJDK_TARGET_OS
  1108 
  1117 
  1132 		RC_FLAGS:=$(RC_FLAGS)\
  1141 		RC_FLAGS:=$(RC_FLAGS)\
  1133 			  -D "JDK_FNAME=jdwp.dll" \
  1142 			  -D "JDK_FNAME=jdwp.dll" \
  1134 			  -D "JDK_INTERNAL_NAME=jdwp" \
  1143 			  -D "JDK_INTERNAL_NAME=jdwp" \
  1135 			  -D "JDK_FTYPE=0x2L",\
  1144 			  -D "JDK_FTYPE=0x2L",\
  1136 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjdwp,\
  1145 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjdwp,\
  1137 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  1146 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  1138 
  1147 
  1139 $(BUILD_LIBJDWP) : $(BUILD_LIBJAVA)
  1148 $(BUILD_LIBJDWP) : $(BUILD_LIBJAVA)
  1140 
  1149 
  1141 BUILD_LIBRARIES += $(BUILD_LIBJDWP)
  1150 BUILD_LIBRARIES += $(BUILD_LIBJDWP)
  1142 
  1151 
  1173 		RC_FLAGS:=$(RC_FLAGS) \
  1182 		RC_FLAGS:=$(RC_FLAGS) \
  1174 			  -D "JDK_FNAME=$(LIBJAAS_NAME).dll" \
  1183 			  -D "JDK_FNAME=$(LIBJAAS_NAME).dll" \
  1175 			  -D "JDK_INTERNAL_NAME=$(LIBJAAS_NAME)" \
  1184 			  -D "JDK_INTERNAL_NAME=$(LIBJAAS_NAME)" \
  1176 			  -D "JDK_FTYPE=0x2L",\
  1185 			  -D "JDK_FTYPE=0x2L",\
  1177 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjaas,\
  1186 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjaas,\
  1178 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  1187 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  1179 
  1188 
  1180 $(BUILD_LIBJAAS) : $(BUILD_LIBJAVA)
  1189 $(BUILD_LIBJAAS) : $(BUILD_LIBJAVA)
  1181 
  1190 
  1182 BUILD_LIBRARIES += $(BUILD_LIBJAAS)
  1191 BUILD_LIBRARIES += $(BUILD_LIBJAAS)
  1183 
  1192 
  1238 		RC_FLAGS:=$(RC_FLAGS)\
  1247 		RC_FLAGS:=$(RC_FLAGS)\
  1239 			  -D "JDK_FNAME=lcms.dll" \
  1248 			  -D "JDK_FNAME=lcms.dll" \
  1240 			  -D "JDK_INTERNAL_NAME=lcms" \
  1249 			  -D "JDK_INTERNAL_NAME=lcms" \
  1241 			  -D "JDK_FTYPE=0x2L",\
  1250 			  -D "JDK_FTYPE=0x2L",\
  1242 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/liblcms,\
  1251 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/liblcms,\
  1243 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  1252 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  1244 
  1253 
  1245     BUILD_LIBRARIES += $(BUILD_LIBLCMS)
  1254     BUILD_LIBRARIES += $(BUILD_LIBLCMS)
  1246 
  1255 
  1247     $(BUILD_LIBLCMS) : $(BUILD_LIBAWT)
  1256     $(BUILD_LIBLCMS) : $(BUILD_LIBAWT)
  1248 
  1257 
  1298 			  -D "JDK_FNAME=jpeg.dll" \
  1307 			  -D "JDK_FNAME=jpeg.dll" \
  1299 			  -D "JDK_INTERNAL_NAME=jpeg" \
  1308 			  -D "JDK_INTERNAL_NAME=jpeg" \
  1300 			  -D "JDK_FTYPE=0x2L",\
  1309 			  -D "JDK_FTYPE=0x2L",\
  1301 		REORDER:=$(BUILD_LIBJPEG_REORDER),\
  1310 		REORDER:=$(BUILD_LIBJPEG_REORDER),\
  1302 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjpeg,\
  1311 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjpeg,\
  1303 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  1312 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  1304 
  1313 
  1305 $(BUILD_LIBJPEG) : $(BUILD_LIBJAVA)
  1314 $(BUILD_LIBJPEG) : $(BUILD_LIBJAVA)
  1306 
  1315 
  1307 BUILD_LIBRARIES += $(BUILD_LIBJPEG)
  1316 BUILD_LIBRARIES += $(BUILD_LIBJPEG)
  1308 
  1317 
  1375 		RC_FLAGS:=$(RC_FLAGS)\
  1384 		RC_FLAGS:=$(RC_FLAGS)\
  1376 			  -D "JDK_FNAME=fontmanager.dll" \
  1385 			  -D "JDK_FNAME=fontmanager.dll" \
  1377 			  -D "JDK_INTERNAL_NAME=fontmanager" \
  1386 			  -D "JDK_INTERNAL_NAME=fontmanager" \
  1378 			  -D "JDK_FTYPE=0x2L",\
  1387 			  -D "JDK_FTYPE=0x2L",\
  1379 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libfontmanager,\
  1388 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libfontmanager,\
  1380 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  1389 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  1381 
  1390 
  1382 $(BUILD_LIBFONTMANAGER) : $(BUILD_LIBAWT)
  1391 $(BUILD_LIBFONTMANAGER) : $(BUILD_LIBAWT)
  1383 
  1392 
  1384 ifneq (,$(findstring $(OPENJDK_TARGET_OS),solaris macosx))
  1393 ifneq (,$(findstring $(OPENJDK_TARGET_OS),solaris macosx))
  1385 $(BUILD_LIBFONTMANAGER) : $(BUILD_LIBAWT_XAWT)
  1394 $(BUILD_LIBFONTMANAGER) : $(BUILD_LIBAWT_XAWT)
  1432 		RC_FLAGS:=$(RC_FLAGS)\
  1441 		RC_FLAGS:=$(RC_FLAGS)\
  1433 			  -D "JDK_FNAME=t2k.dll" \
  1442 			  -D "JDK_FNAME=t2k.dll" \
  1434 			  -D "JDK_INTERNAL_NAME=t2k" \
  1443 			  -D "JDK_INTERNAL_NAME=t2k" \
  1435 			  -D "JDK_FTYPE=0x2L",\
  1444 			  -D "JDK_FTYPE=0x2L",\
  1436 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libt2k,\
  1445 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libt2k,\
  1437 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  1446 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  1438 
  1447 
  1439     # t2k is linked against fontmanager
  1448     # t2k is linked against fontmanager
  1440     $(BUILD_LIBT2K) : $(BUILD_LIBFONTMANAGER)
  1449     $(BUILD_LIBT2K) : $(BUILD_LIBFONTMANAGER)
  1441 
  1450 
  1442     BUILD_LIBRARIES += $(BUILD_LIBT2K)
  1451     BUILD_LIBRARIES += $(BUILD_LIBT2K)
  1470 		RC_FLAGS:=$(RC_FLAGS)\
  1479 		RC_FLAGS:=$(RC_FLAGS)\
  1471 			  -D "JDK_FNAME=jawt.dll" \
  1480 			  -D "JDK_FNAME=jawt.dll" \
  1472 			  -D "JDK_INTERNAL_NAME=jawt" \
  1481 			  -D "JDK_INTERNAL_NAME=jawt" \
  1473 			  -D "JDK_FTYPE=0x2L",\
  1482 			  -D "JDK_FTYPE=0x2L",\
  1474 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjawt,\
  1483 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjawt,\
  1475 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  1484 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  1476 
  1485 
  1477 $(BUILD_LIBJAWT) : $(BUILD_LIBAWT)
  1486 $(BUILD_LIBJAWT) : $(BUILD_LIBAWT)
  1478 
  1487 
  1479 $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX): $(BUILD_LIBJAWT)
  1488 $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX): $(BUILD_LIBJAWT)
  1480 	$(ECHO) Copying $(@F)
  1489 	$(ECHO) Copying $(@F)
  1519 		LDFLAGS_solaris:=-L$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR),\
  1528 		LDFLAGS_solaris:=-L$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR),\
  1520 		LDFLAGS_SUFFIX_linux:=$(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX),\
  1529 		LDFLAGS_SUFFIX_linux:=$(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX),\
  1521 		LDFLAGS_SUFFIX_solaris:=$(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX) -lXrender,\
  1530 		LDFLAGS_SUFFIX_solaris:=$(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX) -lXrender,\
  1522 		LDFLAGS_SUFFIX_macosx:=-Xlinker -rpath -Xlinker @loader_path $(JAWT_LIBS) \
  1531 		LDFLAGS_SUFFIX_macosx:=-Xlinker -rpath -Xlinker @loader_path $(JAWT_LIBS) \
  1523 				       -framework Cocoa $(LDFLAGS_JDKLIB_SUFFIX),\
  1532 				       -framework Cocoa $(LDFLAGS_JDKLIB_SUFFIX),\
  1524 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjawt))
  1533 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjawt,\
       
  1534 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  1525 
  1535 
  1526 ifndef BUILD_HEADLESS_ONLY
  1536 ifndef BUILD_HEADLESS_ONLY
  1527 $(BUILD_LIBJAWT) : $(BUILD_LIBAWT_XAWT)
  1537 $(BUILD_LIBJAWT) : $(BUILD_LIBAWT_XAWT)
  1528 else
  1538 else
  1529 $(BUILD_LIBJAWT) : $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX)
  1539 $(BUILD_LIBJAWT) : $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX)
  1826 		RC_FLAGS:=$(RC_FLAGS)\
  1836 		RC_FLAGS:=$(RC_FLAGS)\
  1827 			  -D "JDK_FNAME=net.dll" \
  1837 			  -D "JDK_FNAME=net.dll" \
  1828 			  -D "JDK_INTERNAL_NAME=net" \
  1838 			  -D "JDK_INTERNAL_NAME=net" \
  1829 			  -D "JDK_FTYPE=0x2L",\
  1839 			  -D "JDK_FTYPE=0x2L",\
  1830 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libnet,\
  1840 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libnet,\
  1831 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  1841 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  1832 
  1842 
  1833 $(BUILD_LIBNET) : $(BUILD_LIBJAVA)
  1843 $(BUILD_LIBNET) : $(BUILD_LIBJAVA)
  1834 
  1844 
  1835 BUILD_LIBRARIES += $(BUILD_LIBNET)
  1845 BUILD_LIBRARIES += $(BUILD_LIBNET)
  1836 
  1846 
  1963 		RC_FLAGS:=$(RC_FLAGS)\
  1973 		RC_FLAGS:=$(RC_FLAGS)\
  1964 			  -D "JDK_FNAME=nio.dll" \
  1974 			  -D "JDK_FNAME=nio.dll" \
  1965 			  -D "JDK_INTERNAL_NAME=nio" \
  1975 			  -D "JDK_INTERNAL_NAME=nio" \
  1966 			  -D "JDK_FTYPE=0x2L",\
  1976 			  -D "JDK_FTYPE=0x2L",\
  1967 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libnio,\
  1977 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libnio,\
  1968 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  1978 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  1969 
  1979 
  1970 BUILD_LIBRARIES += $(BUILD_LIBNIO)
  1980 BUILD_LIBRARIES += $(BUILD_LIBNIO)
  1971 
  1981 
  1972 $(BUILD_LIBNIO) : $(BUILD_LIBNET)
  1982 $(BUILD_LIBNIO) : $(BUILD_LIBNET)
  1973 
  1983 
  2000 			 $(call SET_SHARED_LIBRARY_ORIGIN),\
  2010 			 $(call SET_SHARED_LIBRARY_ORIGIN),\
  2001 		LDFLAGS_SUFFIX_linux:=-lpthread $(LIBDL) -ljava -ljvm,\
  2011 		LDFLAGS_SUFFIX_linux:=-lpthread $(LIBDL) -ljava -ljvm,\
  2002 		LDFLAGS_SUFFIX_posix:=-lnio -lnet,\
  2012 		LDFLAGS_SUFFIX_posix:=-lnio -lnet,\
  2003 		LDFLAGS_SUFFIX_solaris:=-lsocket -ljava -ljvm -lc,\
  2013 		LDFLAGS_SUFFIX_solaris:=-lsocket -ljava -ljvm -lc,\
  2004 		LDFLAGS_SUFFIX_macosx:=-ljava -ljvm,\
  2014 		LDFLAGS_SUFFIX_macosx:=-ljava -ljvm,\
  2005 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsctp))
  2015 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsctp,\
       
  2016 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2006 
  2017 
  2007     BUILD_LIBRARIES += $(BUILD_LIBSCTP)
  2018     BUILD_LIBRARIES += $(BUILD_LIBSCTP)
  2008 
  2019 
  2009     $(BUILD_LIBSCTP) : $(BUILD_LIBNIO)
  2020     $(BUILD_LIBSCTP) : $(BUILD_LIBNIO)
  2010   endif
  2021   endif
  2124 		RC_FLAGS:=$(RC_FLAGS) \
  2135 		RC_FLAGS:=$(RC_FLAGS) \
  2125 			  -D "JDK_FNAME=jli.dll" \
  2136 			  -D "JDK_FNAME=jli.dll" \
  2126 			  -D "JDK_INTERNAL_NAME=jli" \
  2137 			  -D "JDK_INTERNAL_NAME=jli" \
  2127 			  -D "JDK_FTYPE=0x2L",\
  2138 			  -D "JDK_FTYPE=0x2L",\
  2128 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjli,\
  2139 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjli,\
  2129 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  2140 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2130 
  2141 
  2131 BUILD_LIBRARIES += $(BUILD_LIBJLI)
  2142 BUILD_LIBRARIES += $(BUILD_LIBJLI)
  2132 
  2143 
  2133 # On windows, the static library has the same suffix as the import library created by
  2144 # On windows, the static library has the same suffix as the import library created by
  2134 # with the shared library, so the static library is given a different name. No harm
  2145 # with the shared library, so the static library is given a different name. No harm
  2141 		INCLUDE_FILES:=$(BUILD_LIBJLI_FILES),\
  2152 		INCLUDE_FILES:=$(BUILD_LIBJLI_FILES),\
  2142 		LANG:=C,\
  2153 		LANG:=C,\
  2143 		OPTIMIZATION:=HIGH, \
  2154 		OPTIMIZATION:=HIGH, \
  2144 		CFLAGS:=$(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS),\
  2155 		CFLAGS:=$(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS),\
  2145 		ARFLAGS:=$(ARFLAGS),\
  2156 		ARFLAGS:=$(ARFLAGS),\
  2146 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjli_static))
  2157 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjli_static,\
       
  2158 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2147 
  2159 
  2148 BUILD_LIBRARIES += $(BUILD_LIBJLI_STATIC)
  2160 BUILD_LIBRARIES += $(BUILD_LIBJLI_STATIC)
  2149 
  2161 
  2150 else ifeq ($(OPENJDK_TARGET_OS),macosx)
  2162 else ifeq ($(OPENJDK_TARGET_OS),macosx)
  2151     #
  2163     #
  2159 		INCLUDE_FILES:=$(BUILD_LIBJLI_FILES),\
  2171 		INCLUDE_FILES:=$(BUILD_LIBJLI_FILES),\
  2160 		LANG:=C,\
  2172 		LANG:=C,\
  2161 		OPTIMIZATION:=HIGH, \
  2173 		OPTIMIZATION:=HIGH, \
  2162 		CFLAGS:=$(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS),\
  2174 		CFLAGS:=$(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS),\
  2163 		LDFLAGS:=-nostdlib -r,\
  2175 		LDFLAGS:=-nostdlib -r,\
  2164 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjli_static))
  2176 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjli_static,\
       
  2177 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2165 
  2178 
  2166 $(JDK_OUTPUTDIR)/objs/libjli_static.a : $(BUILD_LIBJLI_STATIC)
  2179 $(JDK_OUTPUTDIR)/objs/libjli_static.a : $(BUILD_LIBJLI_STATIC)
  2167 	$(call install-file)
  2180 	$(call install-file)
  2168 
  2181 
  2169 BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/objs/libjli_static.a
  2182 BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/objs/libjli_static.a
  2190 		RC_FLAGS:=$(RC_FLAGS)\
  2203 		RC_FLAGS:=$(RC_FLAGS)\
  2191 			  -D "JDK_FNAME=jfr.dll" \
  2204 			  -D "JDK_FNAME=jfr.dll" \
  2192 			  -D "JDK_INTERNAL_NAME=jfr" \
  2205 			  -D "JDK_INTERNAL_NAME=jfr" \
  2193 			  -D "JDK_FTYPE=0x2L",\
  2206 			  -D "JDK_FTYPE=0x2L",\
  2194 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjfr,\
  2207 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjfr,\
  2195 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  2208 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2196 
  2209 
  2197 BUILD_LIBRARIES += $(BUILD_LIBJFR)
  2210 BUILD_LIBRARIES += $(BUILD_LIBJFR)
  2198 
  2211 
  2199 endif
  2212 endif
  2200 endif
  2213 endif
  2242 		RC_FLAGS:=$(RC_FLAGS)\
  2255 		RC_FLAGS:=$(RC_FLAGS)\
  2243 			  -D "JDK_FNAME=kcms.dll" \
  2256 			  -D "JDK_FNAME=kcms.dll" \
  2244 			  -D "JDK_INTERNAL_NAME=kcms" \
  2257 			  -D "JDK_INTERNAL_NAME=kcms" \
  2245 			  -D "JDK_FTYPE=0x2L",\
  2258 			  -D "JDK_FTYPE=0x2L",\
  2246 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libkcms,\
  2259 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libkcms,\
  2247 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  2260 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2248 
  2261 
  2249 $(BUILD_LIBKCMS) : $(BUILD_LIBJAVA)
  2262 $(BUILD_LIBKCMS) : $(BUILD_LIBJAVA)
  2250 
  2263 
  2251 BUILD_LIBRARIES += $(BUILD_LIBKCMS)
  2264 BUILD_LIBRARIES += $(BUILD_LIBKCMS)
  2252 
  2265 
  2277 			-I$(OPENWIN_HOME)/include, \
  2290 			-I$(OPENWIN_HOME)/include, \
  2278 		MAPFILE:=$(SUNWJDGA_MAPFILE), \
  2291 		MAPFILE:=$(SUNWJDGA_MAPFILE), \
  2279 		LDFLAGS:=$(LDFLAGS_JDKLIB) \
  2292 		LDFLAGS:=$(LDFLAGS_JDKLIB) \
  2280 			 $(call SET_SHARED_LIBRARY_ORIGIN), \
  2293 			 $(call SET_SHARED_LIBRARY_ORIGIN), \
  2281 		LDFLAGS_SUFFIX:=-L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -ldga -lX11 $(LIBDL) -lc, \
  2294 		LDFLAGS_SUFFIX:=-L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -ldga -lX11 $(LIBDL) -lc, \
  2282 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsunwjdga))
  2295 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsunwjdga,\
       
  2296 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2283 
  2297 
  2284 BUILD_LIBRARIES += $(BUILD_LIBSUNWJDGA)
  2298 BUILD_LIBRARIES += $(BUILD_LIBSUNWJDGA)
  2285 
  2299 
  2286 endif
  2300 endif
  2287 endif
  2301 endif
  2367 		LDFLAGS_macosx:=$(call SET_SHARED_LIBRARY_ORIGIN).,\
  2381 		LDFLAGS_macosx:=$(call SET_SHARED_LIBRARY_ORIGIN).,\
  2368 		REORDER:=$(LIBAWT_HEADLESS_REORDER), \
  2382 		REORDER:=$(LIBAWT_HEADLESS_REORDER), \
  2369 		LDFLAGS_SUFFIX_linux:=-ljvm -lawt -lm $(LIBDL) -ljava,\
  2383 		LDFLAGS_SUFFIX_linux:=-ljvm -lawt -lm $(LIBDL) -ljava,\
  2370 		LDFLAGS_SUFFIX_solaris:=$(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc,\
  2384 		LDFLAGS_SUFFIX_solaris:=$(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc,\
  2371 		LDFLAGS_SUFFIX_macosx:=-ljvm $(LIBCXX) -lawt $(LIBDL) -ljava,\
  2385 		LDFLAGS_SUFFIX_macosx:=-ljvm $(LIBCXX) -lawt $(LIBDL) -ljava,\
  2372 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt_headless))
  2386 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt_headless,\
       
  2387 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2373 
  2388 
  2374 $(BUILD_LIBAWT_HEADLESS) : $(BUILD_LIBAWT)
  2389 $(BUILD_LIBAWT_HEADLESS) : $(BUILD_LIBAWT)
  2375 
  2390 
  2376 BUILD_LIBRARIES += $(BUILD_LIBAWT_HEADLESS)
  2391 BUILD_LIBRARIES += $(BUILD_LIBAWT_HEADLESS)
  2377 
  2392 
  2460 		RC_FLAGS:=$(RC_FLAGS)\
  2475 		RC_FLAGS:=$(RC_FLAGS)\
  2461 			  -D "JDK_FNAME=splashscreen.dll" \
  2476 			  -D "JDK_FNAME=splashscreen.dll" \
  2462 			  -D "JDK_INTERNAL_NAME=splashscreen" \
  2477 			  -D "JDK_INTERNAL_NAME=splashscreen" \
  2463 			  -D "JDK_FTYPE=0x2L",\
  2478 			  -D "JDK_FTYPE=0x2L",\
  2464 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsplashscreen,\
  2479 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsplashscreen,\
  2465 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  2480 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2466 
  2481 
  2467 BUILD_LIBRARIES += $(LIBSPLASHSCREEN)
  2482 BUILD_LIBRARIES += $(LIBSPLASHSCREEN)
  2468 
  2483 
  2469 ifeq ($(OPENJDK_TARGET_OS),macosx)
  2484 ifeq ($(OPENJDK_TARGET_OS),macosx)
  2470 $(LIBSPLASHSCREEN) :  $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX) 
  2485 $(LIBSPLASHSCREEN) :  $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX) 
  2502 		RC_FLAGS:=$(RC_FLAGS)\
  2517 		RC_FLAGS:=$(RC_FLAGS)\
  2503 			  -D "JDK_FNAME=dcpr.dll" \
  2518 			  -D "JDK_FNAME=dcpr.dll" \
  2504 			  -D "JDK_INTERNAL_NAME=dcpr" \
  2519 			  -D "JDK_INTERNAL_NAME=dcpr" \
  2505 			  -D "JDK_FTYPE=0x2L",\
  2520 			  -D "JDK_FTYPE=0x2L",\
  2506 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libdcpr,\
  2521 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libdcpr,\
  2507 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  2522 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2508 
  2523 
  2509 $(BUILD_LIBDCPR) : $(BUILD_LIBJAVA)
  2524 $(BUILD_LIBDCPR) : $(BUILD_LIBJAVA)
  2510 
  2525 
  2511 BUILD_LIBRARIES += $(BUILD_LIBDCPR)
  2526 BUILD_LIBRARIES += $(BUILD_LIBDCPR)
  2512 
  2527 
  2536 		RC_FLAGS:=$(RC_FLAGS)\
  2551 		RC_FLAGS:=$(RC_FLAGS)\
  2537 			  -D "JDK_FNAME=j2pcsc.dll" \
  2552 			  -D "JDK_FNAME=j2pcsc.dll" \
  2538 			  -D "JDK_INTERNAL_NAME=j2pcsc" \
  2553 			  -D "JDK_INTERNAL_NAME=j2pcsc" \
  2539 			  -D "JDK_FTYPE=0x2L",\
  2554 			  -D "JDK_FTYPE=0x2L",\
  2540 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libj2pcsc,\
  2555 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libj2pcsc,\
  2541 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  2556 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2542 
  2557 
  2543 BUILD_LIBRARIES += $(BUILD_LIBJ2PCSC)
  2558 BUILD_LIBRARIES += $(BUILD_LIBJ2PCSC)
  2544 
  2559 
  2545 ##########################################################################################
  2560 ##########################################################################################
  2546 
  2561 
  2558 		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libj2gss/mapfile-vers, \
  2573 		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libj2gss/mapfile-vers, \
  2559 		LDFLAGS:=$(LDFLAGS_JDKLIB) \
  2574 		LDFLAGS:=$(LDFLAGS_JDKLIB) \
  2560 			 $(call SET_SHARED_LIBRARY_ORIGIN),\
  2575 			 $(call SET_SHARED_LIBRARY_ORIGIN),\
  2561 		LDFLAGS_SUFFIX:=$(LIBDL),\
  2576 		LDFLAGS_SUFFIX:=$(LIBDL),\
  2562 		LDFLAGS_SUFFIX_solaris:=-lc,\
  2577 		LDFLAGS_SUFFIX_solaris:=-lc,\
  2563 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libj2gss))
  2578 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libj2gss,\
       
  2579 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2564 
  2580 
  2565 BUILD_LIBRARIES += $(BUILD_LIBJ2GSS)
  2581 BUILD_LIBRARIES += $(BUILD_LIBJ2GSS)
  2566 endif
  2582 endif
  2567 
  2583 
  2568 ##########################################################################################
  2584 ##########################################################################################
  2597 		RC_FLAGS:=$(RC_FLAGS)\
  2613 		RC_FLAGS:=$(RC_FLAGS)\
  2598 			  -D "JDK_FNAME=$(BUILD_LIBKRB5_NAME).dll" \
  2614 			  -D "JDK_FNAME=$(BUILD_LIBKRB5_NAME).dll" \
  2599 			  -D "JDK_INTERNAL_NAME=$(BUILD_LIBKRB5_NAME)" \
  2615 			  -D "JDK_INTERNAL_NAME=$(BUILD_LIBKRB5_NAME)" \
  2600 			  -D "JDK_FTYPE=0x2L",\
  2616 			  -D "JDK_FTYPE=0x2L",\
  2601 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libkrb5,\
  2617 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libkrb5,\
  2602 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  2618 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2603 
  2619 
  2604 BUILD_LIBRARIES += $(BUILD_LIBKRB5)
  2620 BUILD_LIBRARIES += $(BUILD_LIBKRB5)
  2605 endif
  2621 endif
  2606 
  2622 
  2607 ##########################################################################################
  2623 ##########################################################################################
  2623 		RC_FLAGS:=$(RC_FLAGS)\
  2639 		RC_FLAGS:=$(RC_FLAGS)\
  2624 			  -D "JDK_FNAME=sunmscapi.dll" \
  2640 			  -D "JDK_FNAME=sunmscapi.dll" \
  2625 			  -D "JDK_INTERNAL_NAME=sunmscapi" \
  2641 			  -D "JDK_INTERNAL_NAME=sunmscapi" \
  2626 			  -D "JDK_FTYPE=0x2L",\
  2642 			  -D "JDK_FTYPE=0x2L",\
  2627 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsunmscapi,\
  2643 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsunmscapi,\
  2628 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  2644 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2629 
  2645 
  2630 BUILD_LIBRARIES += $(BUILD_LIBSUNMSCAPI)
  2646 BUILD_LIBRARIES += $(BUILD_LIBSUNMSCAPI)
  2631 endif
  2647 endif
  2632 
  2648 
  2633 ##########################################################################################
  2649 ##########################################################################################
  2655 		RC_FLAGS:=$(RC_FLAGS)\
  2671 		RC_FLAGS:=$(RC_FLAGS)\
  2656 			  -D "JDK_FNAME=j2pkcs11.dll" \
  2672 			  -D "JDK_FNAME=j2pkcs11.dll" \
  2657 			  -D "JDK_INTERNAL_NAME=j2pkcs11" \
  2673 			  -D "JDK_INTERNAL_NAME=j2pkcs11" \
  2658 			  -D "JDK_FTYPE=0x2L",\
  2674 			  -D "JDK_FTYPE=0x2L",\
  2659 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libj2pkcs11,\
  2675 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libj2pkcs11,\
  2660 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  2676 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2661 
  2677 
  2662 BUILD_LIBRARIES += $(BUILD_LIBJ2PKCS11)
  2678 BUILD_LIBRARIES += $(BUILD_LIBJ2PKCS11)
  2663 
  2679 
  2664 ##########################################################################################
  2680 ##########################################################################################
  2665 
  2681 
  2701 		RC_FLAGS:=$(RC_FLAGS)\
  2717 		RC_FLAGS:=$(RC_FLAGS)\
  2702 			  -D "JDK_FNAME=sunec.dll" \
  2718 			  -D "JDK_FNAME=sunec.dll" \
  2703 			  -D "JDK_INTERNAL_NAME=sunec" \
  2719 			  -D "JDK_INTERNAL_NAME=sunec" \
  2704 			  -D "JDK_FTYPE=0x2L",\
  2720 			  -D "JDK_FTYPE=0x2L",\
  2705 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsunec,\
  2721 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsunec,\
  2706 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  2722 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2707 
  2723 
  2708 BUILD_LIBRARIES += $(BUILD_LIBSUNEC)
  2724 BUILD_LIBRARIES += $(BUILD_LIBSUNEC)
  2709 endif
  2725 endif
  2710 
  2726 
  2711 ##########################################################################################
  2727 ##########################################################################################
  2845 		RC_FLAGS:=$(RC_FLAGS)\
  2861 		RC_FLAGS:=$(RC_FLAGS)\
  2846 			  -D "JDK_FNAME=jsound.dll" \
  2862 			  -D "JDK_FNAME=jsound.dll" \
  2847 			  -D "JDK_INTERNAL_NAME=jsound" \
  2863 			  -D "JDK_INTERNAL_NAME=jsound" \
  2848 			  -D "JDK_FTYPE=0x2L",\
  2864 			  -D "JDK_FTYPE=0x2L",\
  2849 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjsound,\
  2865 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjsound,\
  2850 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  2866 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2851 
  2867 
  2852 $(BUILD_LIBJSOUND) : $(BUILD_LIBJAVA)
  2868 $(BUILD_LIBJSOUND) : $(BUILD_LIBJAVA)
  2853 
  2869 
  2854 BUILD_LIBRARIES += $(BUILD_LIBJSOUND)
  2870 BUILD_LIBRARIES += $(BUILD_LIBJSOUND)
  2855 
  2871 
  2880 			-DUSE_PLATFORM_MIDI_IN=TRUE, \
  2896 			-DUSE_PLATFORM_MIDI_IN=TRUE, \
  2881 		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjsoundalsa/mapfile-vers, \
  2897 		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjsoundalsa/mapfile-vers, \
  2882 		LDFLAGS:=$(LDFLAGS_JDKLIB)\
  2898 		LDFLAGS:=$(LDFLAGS_JDKLIB)\
  2883 			 $(call SET_SHARED_LIBRARY_ORIGIN),\
  2899 			 $(call SET_SHARED_LIBRARY_ORIGIN),\
  2884 		LDFLAGS_SUFFIX:=-lasound -ljava -ljvm,\
  2900 		LDFLAGS_SUFFIX:=-lasound -ljava -ljvm,\
  2885 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjsoundalsa))
  2901 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjsoundalsa,\
       
  2902 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2886 
  2903 
  2887 $(BUILD_LIBJSOUNDALSA) : $(BUILD_LIBJAVA)
  2904 $(BUILD_LIBJSOUNDALSA) : $(BUILD_LIBJAVA)
  2888 
  2905 
  2889 BUILD_LIBRARIES += $(BUILD_LIBJSOUNDALSA)
  2906 BUILD_LIBRARIES += $(BUILD_LIBJSOUNDALSA)
  2890 
  2907 
  2913 		RC_FLAGS:=$(RC_FLAGS)\
  2930 		RC_FLAGS:=$(RC_FLAGS)\
  2914 			  -D "JDK_FNAME=jsoundds.dll" \
  2931 			  -D "JDK_FNAME=jsoundds.dll" \
  2915 			  -D "JDK_INTERNAL_NAME=jsoundds" \
  2932 			  -D "JDK_INTERNAL_NAME=jsoundds" \
  2916 			  -D "JDK_FTYPE=0x2L",\
  2933 			  -D "JDK_FTYPE=0x2L",\
  2917 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjsoundds,\
  2934 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjsoundds,\
  2918 		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
  2935 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2919 
  2936 
  2920 $(BUILD_LIBJSOUNDDS) : $(BUILD_LIBJAVA)
  2937 $(BUILD_LIBJSOUNDDS) : $(BUILD_LIBJAVA)
  2921 
  2938 
  2922 BUILD_LIBRARIES += $(BUILD_LIBJSOUNDDS)
  2939 BUILD_LIBRARIES += $(BUILD_LIBJSOUNDDS)
  2923 
  2940 
  2938 			-I$(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto ,\
  2955 			-I$(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto ,\
  2939 		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libj2ucrypto/mapfile-vers, \
  2956 		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libj2ucrypto/mapfile-vers, \
  2940 		LDFLAGS:=$(LDFLAGS_JDKLIB),\
  2957 		LDFLAGS:=$(LDFLAGS_JDKLIB),\
  2941 		LDFLAGS_SUFFIX:=$(LIBDL),\
  2958 		LDFLAGS_SUFFIX:=$(LIBDL),\
  2942 		LDFLAGS_SUFFIX_solaris:=-lc,\
  2959 		LDFLAGS_SUFFIX_solaris:=-lc,\
  2943 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libj2ucrypto))
  2960 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libj2ucrypto,\
       
  2961 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2944 
  2962 
  2945 $(BUILD_LIBJ2UCRYPTO) : $(BUILD_LIBJAVA)
  2963 $(BUILD_LIBJ2UCRYPTO) : $(BUILD_LIBJAVA)
  2946 
  2964 
  2947 BUILD_LIBRARIES += $(BUILD_LIBJ2UCRYPTO)
  2965 BUILD_LIBRARIES += $(BUILD_LIBJ2UCRYPTO)
  2948 
  2966 
  2968 		LDFLAGS_SUFFIX:=-framework Cocoa \
  2986 		LDFLAGS_SUFFIX:=-framework Cocoa \
  2969                                 -framework Carbon \
  2987                                 -framework Carbon \
  2970                                 -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
  2988                                 -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
  2971                                 -framework JavaNativeFoundation \
  2989                                 -framework JavaNativeFoundation \
  2972                                 $(LDFLAGS_JDKLIB_SUFFIX),\
  2990                                 $(LDFLAGS_JDKLIB_SUFFIX),\
  2973 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libAppleScriptEngine))
  2991 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libAppleScriptEngine,\
       
  2992 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  2974 
  2993 
  2975 $(BUILD_LIBAPPLESCRIPTENGINE) : $(BUILD_LIBJAVA)
  2994 $(BUILD_LIBAPPLESCRIPTENGINE) : $(BUILD_LIBJAVA)
  2976 
  2995 
  2977 BUILD_LIBRARIES += $(BUILD_LIBAPPLESCRIPTENGINE)
  2996 BUILD_LIBRARIES += $(BUILD_LIBAPPLESCRIPTENGINE)
  2978 
  2997 
  3007 	-framework JavaNativeFoundation \
  3026 	-framework JavaNativeFoundation \
  3008 	-framework JavaRuntimeSupport \
  3027 	-framework JavaRuntimeSupport \
  3009 	-framework OpenGL \
  3028 	-framework OpenGL \
  3010 	-framework IOSurface \
  3029 	-framework IOSurface \
  3011 	-framework QuartzCore, \
  3030 	-framework QuartzCore, \
  3012 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libosxapp))
  3031 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libosxapp,\
       
  3032 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  3013 
  3033 
  3014 BUILD_LIBRARIES += $(BUILD_LIBOSXAPP)
  3034 BUILD_LIBRARIES += $(BUILD_LIBOSXAPP)
  3015 
  3035 
  3016 endif
  3036 endif
  3017 
  3037 
  3047     -framework JavaNativeFoundation \
  3067     -framework JavaNativeFoundation \
  3048     -framework JavaRuntimeSupport \
  3068     -framework JavaRuntimeSupport \
  3049     -framework Security \
  3069     -framework Security \
  3050     -framework SystemConfiguration \
  3070     -framework SystemConfiguration \
  3051     $(LDFLAGS_JDKLIB_SUFFIX), \
  3071     $(LDFLAGS_JDKLIB_SUFFIX), \
  3052 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libosx))
  3072 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libosx,\
       
  3073 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  3053 
  3074 
  3054 BUILD_LIBRARIES += $(BUILD_LIBOSX)
  3075 BUILD_LIBRARIES += $(BUILD_LIBOSX)
  3055 
  3076 
  3056 $(BUILD_LIBOSX) : $(BUILD_LIBOSXAPP)
  3077 $(BUILD_LIBOSX) : $(BUILD_LIBOSXAPP)
  3057 
  3078 
  3180 				       -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
  3201 				       -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
  3181 				       -framework JavaNativeFoundation \
  3202 				       -framework JavaNativeFoundation \
  3182 				       -framework JavaRuntimeSupport \
  3203 				       -framework JavaRuntimeSupport \
  3183 				       -framework OpenGL \
  3204 				       -framework OpenGL \
  3184 				       -framework QuartzCore -ljava,\
  3205 				       -framework QuartzCore -ljava,\
  3185 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt_lwawt))
  3206 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt_lwawt,\
       
  3207 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  3186 
  3208 
  3187 BUILD_LIBRARIES += $(BUILD_LIBAWT_LWAWT)
  3209 BUILD_LIBRARIES += $(BUILD_LIBAWT_LWAWT)
  3188 
  3210 
  3189 $(BUILD_LIBAWT_LWAWT) : $(BUILD_LIBAWT) 
  3211 $(BUILD_LIBAWT_LWAWT) : $(BUILD_LIBAWT) 
  3190 
  3212 
  3220 				       -framework ApplicationServices \
  3242 				       -framework ApplicationServices \
  3221 				       -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
  3243 				       -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
  3222 				       -framework JavaNativeFoundation \
  3244 				       -framework JavaNativeFoundation \
  3223 				       -framework JavaRuntimeSupport \
  3245 				       -framework JavaRuntimeSupport \
  3224 				       -ljava -ljvm,\
  3246 				       -ljava -ljvm,\
  3225 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libosxui))
  3247 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libosxui,\
       
  3248 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  3226 
  3249 
  3227 BUILD_LIBRARIES += $(BUILD_LIBOSXUI)
  3250 BUILD_LIBRARIES += $(BUILD_LIBOSXUI)
  3228 
  3251 
  3229 $(BUILD_LIBOSXUI) : $(BUILD_LIBAWT) 
  3252 $(BUILD_LIBOSXUI) : $(BUILD_LIBAWT) 
  3230 
  3253 
  3260 			-m32, \
  3283 			-m32, \
  3261 		LDFLAGS_SUFFIX:=-framework Foundation -framework JavaVM \
  3284 		LDFLAGS_SUFFIX:=-framework Foundation -framework JavaVM \
  3262                                   -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
  3285                                   -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
  3263                                   -framework JavaNativeFoundation \
  3286                                   -framework JavaNativeFoundation \
  3264                                   -lffi, \
  3287                                   -lffi, \
  3265 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjobjc32))
  3288 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjobjc32,\
       
  3289 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  3266 
  3290 
  3267 $(eval $(call SetupNativeCompilation,BUILD_LIBJOBJC64,\
  3291 $(eval $(call SetupNativeCompilation,BUILD_LIBJOBJC64,\
  3268 		LIBRARY:=JObjC,\
  3292 		LIBRARY:=JObjC,\
  3269                 OUTPUT_DIR:=$(JDK_OUTPUTDIR)/objs/libjobjc64,\
  3293                 OUTPUT_DIR:=$(JDK_OUTPUTDIR)/objs/libjobjc64,\
  3270 		SRC:=$(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/native \
  3294 		SRC:=$(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/native \
  3284 			 $(call SET_SHARED_LIBRARY_ORIGIN), \
  3308 			 $(call SET_SHARED_LIBRARY_ORIGIN), \
  3285 		LDFLAGS_SUFFIX:=-framework Foundation -framework JavaVM \
  3309 		LDFLAGS_SUFFIX:=-framework Foundation -framework JavaVM \
  3286                                   -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
  3310                                   -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
  3287                                   -framework JavaNativeFoundation \
  3311                                   -framework JavaNativeFoundation \
  3288                                   -lffi, \
  3312                                   -lffi, \
  3289 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjobjc64))
  3313 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjobjc64,\
       
  3314 		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
  3290 
  3315 
  3291 $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)JObjC$(SHARED_LIBRARY_SUFFIX): $(BUILD_LIBJOBJC32) $(BUILD_LIBJOBJC64)
  3316 $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)JObjC$(SHARED_LIBRARY_SUFFIX): $(BUILD_LIBJOBJC32) $(BUILD_LIBJOBJC64)
  3292 	$(LIPO) -create -output $@ $(BUILD_LIBJOBJC32) $(BUILD_LIBJOBJC64)
  3317 	$(LIPO) -create -output $@ $(BUILD_LIBJOBJC32) $(BUILD_LIBJOBJC64)
  3293 
  3318 
  3294 BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)JObjC$(SHARED_LIBRARY_SUFFIX)
  3319 BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)JObjC$(SHARED_LIBRARY_SUFFIX)