47 ifeq ($(USE_EXTERNAL_LIBZ), true) |
47 ifeq ($(USE_EXTERNAL_LIBZ), true) |
48 UNPACKEXE_CFLAGS += -DSYSTEM_ZLIB |
48 UNPACKEXE_CFLAGS += -DSYSTEM_ZLIB |
49 UNPACKEXE_ZIPOBJS := -lz |
49 UNPACKEXE_ZIPOBJS := -lz |
50 else |
50 else |
51 UNPACKEXE_CFLAGS += -I$(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib-1.2.8 |
51 UNPACKEXE_CFLAGS += -I$(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib-1.2.8 |
52 UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \ |
52 UNPACKEXE_ZIPOBJS := $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/zcrc32$(OBJ_SUFFIX) \ |
53 $(JDK_OUTPUTDIR)/objs/libzip/deflate$(OBJ_SUFFIX) \ |
53 $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/deflate$(OBJ_SUFFIX) \ |
54 $(JDK_OUTPUTDIR)/objs/libzip/trees$(OBJ_SUFFIX) \ |
54 $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/trees$(OBJ_SUFFIX) \ |
55 $(JDK_OUTPUTDIR)/objs/libzip/zadler32$(OBJ_SUFFIX) \ |
55 $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/zadler32$(OBJ_SUFFIX) \ |
56 $(JDK_OUTPUTDIR)/objs/libzip/compress$(OBJ_SUFFIX) \ |
56 $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/compress$(OBJ_SUFFIX) \ |
57 $(JDK_OUTPUTDIR)/objs/libzip/zutil$(OBJ_SUFFIX) \ |
57 $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/zutil$(OBJ_SUFFIX) \ |
58 $(JDK_OUTPUTDIR)/objs/libzip/inflate$(OBJ_SUFFIX) \ |
58 $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/inflate$(OBJ_SUFFIX) \ |
59 $(JDK_OUTPUTDIR)/objs/libzip/infback$(OBJ_SUFFIX) \ |
59 $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/infback$(OBJ_SUFFIX) \ |
60 $(JDK_OUTPUTDIR)/objs/libzip/inftrees$(OBJ_SUFFIX) \ |
60 $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/inftrees$(OBJ_SUFFIX) \ |
61 $(JDK_OUTPUTDIR)/objs/libzip/inffast$(OBJ_SUFFIX) |
61 $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/inffast$(OBJ_SUFFIX) |
62 |
62 |
63 endif |
63 endif |
64 |
64 |
65 UNPACKEXE_LANG := C |
65 UNPACKEXE_LANG := C |
66 ifeq ($(OPENJDK_TARGET_OS), solaris) |
66 ifeq ($(OPENJDK_TARGET_OS), solaris) |
106 $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \ |
106 $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \ |
107 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
107 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
108 LDFLAGS_linux := -lc, \ |
108 LDFLAGS_linux := -lc, \ |
109 LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \ |
109 LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \ |
110 LDFLAGS_SUFFIX := $(LIBCXX), \ |
110 LDFLAGS_SUFFIX := $(LIBCXX), \ |
111 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \ |
111 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpackexe$(OUTPUT_SUBDIR), \ |
112 OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \ |
112 OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpackexe$(OUTPUT_SUBDIR), \ |
113 PROGRAM := unpack200, \ |
113 PROGRAM := unpack200, \ |
114 VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
114 VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
115 RC_FLAGS := $(RC_FLAGS) \ |
115 RC_FLAGS := $(RC_FLAGS) \ |
116 -D "JDK_FNAME=unpack200.exe" \ |
116 -D "JDK_FNAME=unpack200.exe" \ |
117 -D "JDK_INTERNAL_NAME=unpack200" \ |
117 -D "JDK_INTERNAL_NAME=unpack200" \ |
131 |
131 |
132 # Build into object dir and copy executable afterwards to avoid .ilk file in |
132 # Build into object dir and copy executable afterwards to avoid .ilk file in |
133 # image. The real fix would be clean up linking of unpack200 using |
133 # image. The real fix would be clean up linking of unpack200 using |
134 # -link -incremental:no |
134 # -link -incremental:no |
135 # like all other launchers. |
135 # like all other launchers. |
136 $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX): $(BUILD_UNPACKEXE) |
136 $(SUPPORT_OUTPUTDIR)/modules_cmds/$(MODULE)/unpack200$(EXE_SUFFIX): $(BUILD_UNPACKEXE) |
137 $(call install-file) |
137 $(call install-file) |
138 |
138 |
139 LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX) |
139 TARGETS += $(SUPPORT_OUTPUTDIR)/modules_cmds/$(MODULE)/unpack200$(EXE_SUFFIX) |
140 |
140 |
141 ################################################################################ |
141 ################################################################################ |
142 |
|
143 jdk.runtime: $(LAUNCHERS) |
|
144 |
|
145 all: jdk.runtime |
|
146 |
|
147 .PHONY: all jdk.runtime |
|