298 MAPFILE:=$(BUILD_LIBMLIB_IMAGE_MAPFILE), \ |
298 MAPFILE:=$(BUILD_LIBMLIB_IMAGE_MAPFILE), \ |
299 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
299 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
300 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
300 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
301 LDFLAGS_SUFFIX:=$(BUILD_LIBMLIB_LDLIBS) \ |
301 LDFLAGS_SUFFIX:=$(BUILD_LIBMLIB_LDLIBS) \ |
302 $(LDFLAGS_JDKLIB_SUFFIX),\ |
302 $(LDFLAGS_JDKLIB_SUFFIX),\ |
|
303 LDFLAGS_SUFFIX_solaris:=-lc, \ |
303 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
304 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
304 RC_FLAGS:=$(RC_FLAGS)\ |
305 RC_FLAGS:=$(RC_FLAGS)\ |
305 -D "JDK_FNAME=mlib_image.dll" \ |
306 -D "JDK_FNAME=mlib_image.dll" \ |
306 -D "JDK_INTERNAL_NAME=mlib_image" \ |
307 -D "JDK_INTERNAL_NAME=mlib_image" \ |
307 -D "JDK_FTYPE=0x2L",\ |
308 -D "JDK_FTYPE=0x2L",\ |
426 $(CFLAGS_JDKLIB), \ |
427 $(CFLAGS_JDKLIB), \ |
427 MAPFILE:=$(BUILD_LIBMLIB_IMAGE_MAPFILE), \ |
428 MAPFILE:=$(BUILD_LIBMLIB_IMAGE_MAPFILE), \ |
428 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
429 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
429 $(BUILD_LIBMLIB_LDLIBS) -ljava -ljvm \ |
430 $(BUILD_LIBMLIB_LDLIBS) -ljava -ljvm \ |
430 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
431 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
|
432 LDFLAGS_SUFFIX_solaris:=-lc,\ |
431 OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libmlib_image_v)) |
433 OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libmlib_image_v)) |
432 |
434 |
433 $(BUILD_LIBMLIB_IMAGE_V): $(BUILD_LIBJAVA) |
435 $(BUILD_LIBMLIB_IMAGE_V): $(BUILD_LIBJAVA) |
434 |
436 |
435 BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE_V) |
437 BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE_V) |
708 ASFLAGS:=$(LIBAWT_ASFLAGS),\ |
710 ASFLAGS:=$(LIBAWT_ASFLAGS),\ |
709 MAPFILE:=$(LIBAWT_MAPFILE), \ |
711 MAPFILE:=$(LIBAWT_MAPFILE), \ |
710 LDFLAGS:=$(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN),\ |
712 LDFLAGS:=$(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN),\ |
711 LDFLAGS_solaris:=-R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR),\ |
713 LDFLAGS_solaris:=-R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR),\ |
712 LDFLAGS_SUFFIX_linux:=-ljvm $(LIBM) $(LIBDL) -ljava,\ |
714 LDFLAGS_SUFFIX_linux:=-ljvm $(LIBM) $(LIBDL) -ljava,\ |
713 LDFLAGS_SUFFIX_solaris:=-ljvm $(LIBM) $(LIBDL) -ljava,\ |
715 LDFLAGS_SUFFIX_solaris:=-ljvm $(LIBM) $(LIBDL) -ljava -lc,\ |
714 LDFLAGS_SUFFIX_macosx:=-lmlib_image -ljvm $(LIBM) \ |
716 LDFLAGS_SUFFIX_macosx:=-lmlib_image -ljvm $(LIBM) \ |
715 -framework Cocoa \ |
717 -framework Cocoa \ |
716 -framework OpenGL \ |
718 -framework OpenGL \ |
717 -F/System/Library/Frameworks/JavaVM.framework/Frameworks \ |
719 -F/System/Library/Frameworks/JavaVM.framework/Frameworks \ |
718 -framework JavaNativeFoundation \ |
720 -framework JavaNativeFoundation \ |
964 $(EXPORT_ZIP_FUNCS), \ |
966 $(EXPORT_ZIP_FUNCS), \ |
965 LDFLAGS_windows:=-export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \ |
967 LDFLAGS_windows:=-export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \ |
966 -export:ZIP_ReadEntry -export:ZIP_GetNextEntry jvm.lib \ |
968 -export:ZIP_ReadEntry -export:ZIP_GetNextEntry jvm.lib \ |
967 $(WIN_JAVA_LIB),\ |
969 $(WIN_JAVA_LIB),\ |
968 LDFLAGS_SUFFIX_linux:=-ljvm -ljava $(LIBZ),\ |
970 LDFLAGS_SUFFIX_linux:=-ljvm -ljava $(LIBZ),\ |
969 LDFLAGS_SUFFIX_solaris:=-ljvm -ljava $(LIBZ),\ |
971 LDFLAGS_SUFFIX_solaris:=-ljvm -ljava $(LIBZ) -lc,\ |
970 LDFLAGS_SUFFIX_macosx:=$(LIBZ) -ljava -ljvm,\ |
972 LDFLAGS_SUFFIX_macosx:=$(LIBZ) -ljava -ljvm,\ |
971 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
973 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
972 RC_FLAGS:=$(RC_FLAGS)\ |
974 RC_FLAGS:=$(RC_FLAGS)\ |
973 -D "JDK_FNAME=zip.dll" \ |
975 -D "JDK_FNAME=zip.dll" \ |
974 -D "JDK_INTERNAL_NAME=zip" \ |
976 -D "JDK_INTERNAL_NAME=zip" \ |
1142 -I$(JDK_OUTPUTDIR)/gensrc_jdwp_headers,\ |
1144 -I$(JDK_OUTPUTDIR)/gensrc_jdwp_headers,\ |
1143 MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjdwp/mapfile-vers, \ |
1145 MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjdwp/mapfile-vers, \ |
1144 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
1146 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
1145 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
1147 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
1146 LDFLAGS_SUFFIX_linux:=$(LIBDL),\ |
1148 LDFLAGS_SUFFIX_linux:=$(LIBDL),\ |
1147 LDFLAGS_SUFFIX_solaris:=$(LIBDL),\ |
1149 LDFLAGS_SUFFIX_solaris:=$(LIBDL) -lc,\ |
1148 LDFLAGS_SUFFIX_windows:=$(LDFLAGS_JDKLIB_SUFFIX),\ |
1150 LDFLAGS_SUFFIX_windows:=$(LDFLAGS_JDKLIB_SUFFIX),\ |
1149 LDFLAGS_SUFFIX:=,\ |
|
1150 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
1151 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
1151 RC_FLAGS:=$(RC_FLAGS)\ |
1152 RC_FLAGS:=$(RC_FLAGS)\ |
1152 -D "JDK_FNAME=jdwp.dll" \ |
1153 -D "JDK_FNAME=jdwp.dll" \ |
1153 -D "JDK_INTERNAL_NAME=jdwp" \ |
1154 -D "JDK_INTERNAL_NAME=jdwp" \ |
1154 -D "JDK_FTYPE=0x2L",\ |
1155 -D "JDK_FTYPE=0x2L",\ |
1184 MAPFILE:=$(LIBJAAS_MAPFILE),\ |
1185 MAPFILE:=$(LIBJAAS_MAPFILE),\ |
1185 LDFLAGS:=$(filter-out -ljava,$(LDFLAGS_JDKLIB)) \ |
1186 LDFLAGS:=$(filter-out -ljava,$(LDFLAGS_JDKLIB)) \ |
1186 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
1187 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
1187 LDFLAGS_windows:=netapi32.lib user32.lib mpr.lib advapi32.lib,\ |
1188 LDFLAGS_windows:=netapi32.lib user32.lib mpr.lib advapi32.lib,\ |
1188 LDFLAGS_SUFFIX_windows:=$(LDFLAGS_JDKLIB_SUFFIX),\ |
1189 LDFLAGS_SUFFIX_windows:=$(LDFLAGS_JDKLIB_SUFFIX),\ |
1189 LDFLAGS_SUFFIX:=,\ |
1190 LDFLAGS_SUFFIX_solaris:=-lc,\ |
1190 EXCLUDE_FILES:=$(LIBJAAS_EXCLUDE_FILES),\ |
1191 EXCLUDE_FILES:=$(LIBJAAS_EXCLUDE_FILES),\ |
1191 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
1192 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
1192 RC_FLAGS:=$(RC_FLAGS) \ |
1193 RC_FLAGS:=$(RC_FLAGS) \ |
1193 -D "JDK_FNAME=$(LIBJAAS_NAME).dll" \ |
1194 -D "JDK_FNAME=$(LIBJAAS_NAME).dll" \ |
1194 -D "JDK_INTERNAL_NAME=$(LIBJAAS_NAME)" \ |
1195 -D "JDK_INTERNAL_NAME=$(LIBJAAS_NAME)" \ |
1215 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
1216 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
1216 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
1217 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
1217 LDFLAGS_SUFFIX_linux:=$(LIBDL),\ |
1218 LDFLAGS_SUFFIX_linux:=$(LIBDL),\ |
1218 LDFLAGS_SUFFIX_windows:=$(LDFLAGS_JDKLIB_SUFFIX) $(LIBDL),\ |
1219 LDFLAGS_SUFFIX_windows:=$(LDFLAGS_JDKLIB_SUFFIX) $(LIBDL),\ |
1219 LDFLAGS_SUFFIX_macosx:= $(LIBDL),\ |
1220 LDFLAGS_SUFFIX_macosx:= $(LIBDL),\ |
1220 LDFLAGS_SUFFIX:=,\ |
1221 LDFLAGS_SUFFIX_solaris:=-lc,\ |
1221 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
1222 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
1222 RC_FLAGS:=$(RC_FLAGS)\ |
1223 RC_FLAGS:=$(RC_FLAGS)\ |
1223 -D "JDK_FNAME=jsdt.dll" \ |
1224 -D "JDK_FNAME=jsdt.dll" \ |
1224 -D "JDK_INTERNAL_NAME=jsdt" \ |
1225 -D "JDK_INTERNAL_NAME=jsdt" \ |
1225 -D "JDK_FTYPE=0x2L",\ |
1226 -D "JDK_FTYPE=0x2L",\ |
1257 MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/liblcms/mapfile-vers, \ |
1258 MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/liblcms/mapfile-vers, \ |
1258 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
1259 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
1259 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
1260 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
1260 LDFLAGS_solaris:=/usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2,\ |
1261 LDFLAGS_solaris:=/usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2,\ |
1261 LDFLAGS_windows:=$(WIN_AWT_LIB) $(WIN_JAVA_LIB),\ |
1262 LDFLAGS_windows:=$(WIN_AWT_LIB) $(WIN_JAVA_LIB),\ |
1262 LDFLAGS_SUFFIX_solaris:=-lawt -ljava -ljvm,\ |
1263 LDFLAGS_SUFFIX_solaris:=-lawt -ljava -ljvm -lc,\ |
1263 LDFLAGS_SUFFIX_macosx:=$(LIBM) -lawt -ljava -ljvm,\ |
1264 LDFLAGS_SUFFIX_macosx:=$(LIBM) -lawt -ljava -ljvm,\ |
1264 LDFLAGS_SUFFIX_linux:=-lm -lawt -ljava -ljvm,\ |
1265 LDFLAGS_SUFFIX_linux:=-lm -lawt -ljava -ljvm,\ |
1265 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
1266 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
1266 RC_FLAGS:=$(RC_FLAGS)\ |
1267 RC_FLAGS:=$(RC_FLAGS)\ |
1267 -D "JDK_FNAME=lcms.dll" \ |
1268 -D "JDK_FNAME=lcms.dll" \ |
1624 LDFLAGS_solaris:= $(call SET_SHARED_LIBRARY_ORIGIN,/jli),\ |
1625 LDFLAGS_solaris:= $(call SET_SHARED_LIBRARY_ORIGIN,/jli),\ |
1625 LDFLAGS_macosx:=-Xlinker -all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \ |
1626 LDFLAGS_macosx:=-Xlinker -all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \ |
1626 -framework Cocoa -framework Security -framework ApplicationServices,\ |
1627 -framework Cocoa -framework Security -framework ApplicationServices,\ |
1627 LDFLAGS_SUFFIX:=$(LIBINSTRUMENT_LDFLAGS_SUFFIX),\ |
1628 LDFLAGS_SUFFIX:=$(LIBINSTRUMENT_LDFLAGS_SUFFIX),\ |
1628 LDFLAGS_SUFFIX_macosx:=-liconv $(LIBZ),\ |
1629 LDFLAGS_SUFFIX_macosx:=-liconv $(LIBZ),\ |
1629 LDFLAGS_SUFFIX_solaris:=$(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL),\ |
1630 LDFLAGS_SUFFIX_solaris:=$(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc,\ |
1630 LDFLAGS_SUFFIX_linux:=$(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL),\ |
1631 LDFLAGS_SUFFIX_linux:=$(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL),\ |
1631 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
1632 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
1632 RC_FLAGS:=$(RC_FLAGS)\ |
1633 RC_FLAGS:=$(RC_FLAGS)\ |
1633 -D "JDK_FNAME=instrument.dll" \ |
1634 -D "JDK_FNAME=instrument.dll" \ |
1634 -D "JDK_INTERNAL_NAME=instrument" \ |
1635 -D "JDK_INTERNAL_NAME=instrument" \ |
1714 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \ |
1715 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \ |
1715 -I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo |
1716 -I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo |
1716 |
1717 |
1717 BUILD_LIBHPROF_LDFLAGS:= |
1718 BUILD_LIBHPROF_LDFLAGS:= |
1718 |
1719 |
1719 ifeq ($(OPENJDK_TARGET_OS),solaris) |
|
1720 BUILD_LIBHPROF_LDFLAGS += -lsocket -lnsl -lc |
|
1721 endif |
|
1722 |
|
1723 LIBHPROF_OPTIMIZATION:=HIGHEST |
1720 LIBHPROF_OPTIMIZATION:=HIGHEST |
1724 ifneq ($(findstring $(OPENJDK_TARGET_OS),solaris linux),) |
1721 ifneq ($(findstring $(OPENJDK_TARGET_OS),solaris linux),) |
1725 ifeq ($(ENABLE_DEBUG_SYMBOLS), yes) |
1722 ifeq ($(ENABLE_DEBUG_SYMBOLS), yes) |
1726 LIBHPROF_OPTIMIZATION:=LOW |
1723 LIBHPROF_OPTIMIZATION:=LOW |
1727 endif |
1724 endif |
1728 endif |
|
1729 |
|
1730 ifneq ($(OPENJDK_TARGET_OS),windows) |
|
1731 BUILD_LIBHPROF_LDFLAGS += $(LIBDL) |
|
1732 endif |
1725 endif |
1733 |
1726 |
1734 $(eval $(call SetupNativeCompilation,BUILD_LIBHPROF,\ |
1727 $(eval $(call SetupNativeCompilation,BUILD_LIBHPROF,\ |
1735 LIBRARY:=hprof, \ |
1728 LIBRARY:=hprof, \ |
1736 OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ |
1729 OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ |
1742 CFLAGS_debug:=-DHPROF_LOGGING,\ |
1735 CFLAGS_debug:=-DHPROF_LOGGING,\ |
1743 MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libhprof/mapfile-vers, \ |
1736 MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libhprof/mapfile-vers, \ |
1744 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
1737 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
1745 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
1738 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
1746 LDFLAGS_windows:=wsock32.lib winmm.lib advapi32.lib,\ |
1739 LDFLAGS_windows:=wsock32.lib winmm.lib advapi32.lib,\ |
1747 LDFLAGS_SUFFIX:=$(BUILD_LIBHPROF_LDFLAGS),\ |
1740 LDFLAGS_SUFFIX_linux:=$(LIBDL),\ |
|
1741 LDFLAGS_SUFFIX_macosx:=$(LIBDL),\ |
|
1742 LDFLAGS_SUFFIX_solaris:=-lsocket -lnsl $(LIBDL) -lc,\ |
1748 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
1743 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
1749 RC_FLAGS:=$(RC_FLAGS)\ |
1744 RC_FLAGS:=$(RC_FLAGS)\ |
1750 -D "JDK_FNAME=hprof.dll" \ |
1745 -D "JDK_FNAME=hprof.dll" \ |
1751 -D "JDK_INTERNAL_NAME=hprof" \ |
1746 -D "JDK_INTERNAL_NAME=hprof" \ |
1752 -D "JDK_FTYPE=0x2L",\ |
1747 -D "JDK_FTYPE=0x2L",\ |
1766 CFLAGS:=$(CFLAGS_JDKLIB) \ |
1761 CFLAGS:=$(CFLAGS_JDKLIB) \ |
1767 -I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo,\ |
1762 -I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo,\ |
1768 MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjava_crw_demo/mapfile-vers, \ |
1763 MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjava_crw_demo/mapfile-vers, \ |
1769 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
1764 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
1770 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
1765 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
|
1766 LDFLAGS_SUFFIX_solaris:=-lc,\ |
1771 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
1767 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
1772 RC_FLAGS:=$(RC_FLAGS)\ |
1768 RC_FLAGS:=$(RC_FLAGS)\ |
1773 -D "JDK_FNAME=java_crw_demo.dll" \ |
1769 -D "JDK_FNAME=java_crw_demo.dll" \ |
1774 -D "JDK_INTERNAL_NAME=java_crw_demo" \ |
1770 -D "JDK_INTERNAL_NAME=java_crw_demo" \ |
1775 -D "JDK_FTYPE=0x2L",\ |
1771 -D "JDK_FTYPE=0x2L",\ |
2390 SRC:=$(LIBAWT_HEADLESS_DIRS),\ |
2386 SRC:=$(LIBAWT_HEADLESS_DIRS),\ |
2391 INCLUDE_FILES:=$(LIBAWT_HEADLESS_FILES),\ |
2387 INCLUDE_FILES:=$(LIBAWT_HEADLESS_FILES),\ |
2392 LANG:=C,\ |
2388 LANG:=C,\ |
2393 OPTIMIZATION:=LOW, \ |
2389 OPTIMIZATION:=LOW, \ |
2394 CFLAGS:=$(CFLAGS_JDKLIB) $(LIBAWT_HEADLESS_CFLAGS),\ |
2390 CFLAGS:=$(CFLAGS_JDKLIB) $(LIBAWT_HEADLESS_CFLAGS),\ |
2395 MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libawt_headless/mapfile-vers, \ |
2391 MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libawt_headless/mapfile-vers,\ |
2396 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
2392 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
2397 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
2393 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
2398 LDFLAGS_linux:=$(call SET_SHARED_LIBRARY_ORIGIN,/..),\ |
2394 LDFLAGS_linux:=$(call SET_SHARED_LIBRARY_ORIGIN,/..),\ |
2399 LDFLAGS_solaris:=$(call SET_SHARED_LIBRARY_ORIGIN,/..) \ |
2395 LDFLAGS_solaris:=$(call SET_SHARED_LIBRARY_ORIGIN,/..) \ |
2400 -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \ |
2396 -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \ |
2401 -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR),\ |
2397 -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR),\ |
2402 LDFLAGS_macosx:=$(call SET_SHARED_LIBRARY_ORIGIN).,\ |
2398 LDFLAGS_macosx:=$(call SET_SHARED_LIBRARY_ORIGIN).,\ |
2403 REORDER:=$(LIBAWT_HEADLESS_REORDER), \ |
2399 REORDER:=$(LIBAWT_HEADLESS_REORDER), \ |
2404 LDFLAGS_SUFFIX_linux:=-ljvm -lawt -lm $(LIBDL) -ljava,\ |
2400 LDFLAGS_SUFFIX_linux:=-ljvm -lawt -lm $(LIBDL) -ljava,\ |
2405 LDFLAGS_SUFFIX_solaris:=$(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX), \ |
2401 LDFLAGS_SUFFIX_solaris:=$(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc,\ |
2406 LDFLAGS_SUFFIX_macosx:=-ljvm $(LIBCXX) -lawt $(LIBDL) -ljava, \ |
2402 LDFLAGS_SUFFIX_macosx:=-ljvm $(LIBCXX) -lawt $(LIBDL) -ljava,\ |
2407 OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt_headless)) |
2403 OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt_headless)) |
2408 |
2404 |
2409 $(BUILD_LIBAWT_HEADLESS) : $(BUILD_LIBAWT) |
2405 $(BUILD_LIBAWT_HEADLESS) : $(BUILD_LIBAWT) |
2410 |
2406 |
2411 BUILD_LIBRARIES += $(BUILD_LIBAWT_HEADLESS) |
2407 BUILD_LIBRARIES += $(BUILD_LIBAWT_HEADLESS) |
2570 CFLAGS:=$(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB),\ |
2566 CFLAGS:=$(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB),\ |
2571 MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libsplashscreen/mapfile-vers, \ |
2567 MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libsplashscreen/mapfile-vers, \ |
2572 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
2568 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
2573 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
2569 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
2574 LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ),\ |
2570 LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ),\ |
|
2571 LDFLAGS_SUFFIX_solaris:=-lc,\ |
2575 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
2572 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
2576 RC_FLAGS:=$(RC_FLAGS)\ |
2573 RC_FLAGS:=$(RC_FLAGS)\ |
2577 -D "JDK_FNAME=splashscreen.dll" \ |
2574 -D "JDK_FNAME=splashscreen.dll" \ |
2578 -D "JDK_INTERNAL_NAME=splashscreen" \ |
2575 -D "JDK_INTERNAL_NAME=splashscreen" \ |
2579 -D "JDK_FTYPE=0x2L",\ |
2576 -D "JDK_FTYPE=0x2L",\ |
2645 MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libj2pcsc/mapfile-vers, \ |
2642 MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libj2pcsc/mapfile-vers, \ |
2646 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
2643 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
2647 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
2644 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
2648 LDFLAGS_SUFFIX_posix:=$(LIBDL), \ |
2645 LDFLAGS_SUFFIX_posix:=$(LIBDL), \ |
2649 LDFLAGS_SUFFIX_windows:=winscard.lib,\ |
2646 LDFLAGS_SUFFIX_windows:=winscard.lib,\ |
|
2647 LDFLAGS_SUFFIX_solaris:=-lc,\ |
2650 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
2648 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
2651 RC_FLAGS:=$(RC_FLAGS)\ |
2649 RC_FLAGS:=$(RC_FLAGS)\ |
2652 -D "JDK_FNAME=j2pcsc.dll" \ |
2650 -D "JDK_FNAME=j2pcsc.dll" \ |
2653 -D "JDK_INTERNAL_NAME=j2pcsc" \ |
2651 -D "JDK_INTERNAL_NAME=j2pcsc" \ |
2654 -D "JDK_FTYPE=0x2L",\ |
2652 -D "JDK_FTYPE=0x2L",\ |
2671 -I$(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \ |
2669 -I$(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \ |
2672 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper,\ |
2670 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper,\ |
2673 MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libj2gss/mapfile-vers, \ |
2671 MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libj2gss/mapfile-vers, \ |
2674 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
2672 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
2675 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
2673 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
2676 LDFLAGS_SUFFIX:=$(LIBDL), \ |
2674 LDFLAGS_SUFFIX:=$(LIBDL),\ |
|
2675 LDFLAGS_SUFFIX_solaris:=-lc,\ |
2677 OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libj2gss)) |
2676 OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libj2gss)) |
2678 |
2677 |
2679 BUILD_LIBRARIES += $(BUILD_LIBJ2GSS) |
2678 BUILD_LIBRARIES += $(BUILD_LIBJ2GSS) |
2680 endif |
2679 endif |
2681 |
2680 |
2765 -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \ |
2764 -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \ |
2766 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper,\ |
2765 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper,\ |
2767 MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libj2pkcs11/mapfile-vers, \ |
2766 MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libj2pkcs11/mapfile-vers, \ |
2768 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
2767 LDFLAGS:=$(LDFLAGS_JDKLIB) \ |
2769 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
2768 $(call SET_SHARED_LIBRARY_ORIGIN),\ |
2770 LDFLAGS_SUFFIX_posix:=$(LIBDL), \ |
2769 LDFLAGS_SUFFIX_posix:=$(LIBDL),\ |
|
2770 LDFLAGS_SUFFIX_solaris:=-lc,\ |
2771 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
2771 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ |
2772 RC_FLAGS:=$(RC_FLAGS)\ |
2772 RC_FLAGS:=$(RC_FLAGS)\ |
2773 -D "JDK_FNAME=j2pkcs11.dll" \ |
2773 -D "JDK_FNAME=j2pkcs11.dll" \ |
2774 -D "JDK_INTERNAL_NAME=j2pkcs11" \ |
2774 -D "JDK_INTERNAL_NAME=j2pkcs11" \ |
2775 -D "JDK_FTYPE=0x2L",\ |
2775 -D "JDK_FTYPE=0x2L",\ |