26 INCLUDEDIR = $(JDK_OUTPUTDIR)/include |
26 INCLUDEDIR = $(JDK_OUTPUTDIR)/include |
27 |
27 |
28 OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/$(OPENJDK_TARGET_OS) |
28 OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/$(OPENJDK_TARGET_OS) |
29 |
29 |
30 ifeq ($(OPENJDK_TARGET_OS), windows) |
30 ifeq ($(OPENJDK_TARGET_OS), windows) |
31 OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/win32 |
31 OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/win32 |
32 else ifeq ($(OPENJDK_TARGET_OS), macosx) |
32 else ifeq ($(OPENJDK_TARGET_OS), macosx) |
33 OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/darwin |
33 OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/darwin |
34 endif |
34 endif |
35 |
35 |
36 # |
36 # |
37 # Copy exported header files to outputdir. |
37 # Copy exported header files to outputdir. |
38 # |
38 # |
39 H_TARGET_FILES =$(INCLUDEDIR)/jdwpTransport.h \ |
39 H_TARGET_FILES = $(INCLUDEDIR)/jdwpTransport.h \ |
40 $(INCLUDEDIR)/jni.h \ |
40 $(INCLUDEDIR)/jni.h \ |
41 $(INCLUDEDIR)/jvmti.h \ |
41 $(INCLUDEDIR)/jvmti.h \ |
42 $(INCLUDEDIR)/jvmticmlr.h \ |
42 $(INCLUDEDIR)/jvmticmlr.h \ |
43 $(INCLUDEDIR)/classfile_constants.h \ |
43 $(INCLUDEDIR)/classfile_constants.h \ |
44 $(INCLUDEDIR)/jawt.h \ |
44 $(INCLUDEDIR)/jawt.h \ |
45 $(OPENJDK_TARGET_OS_INCLUDE)/jni_md.h \ |
45 $(OPENJDK_TARGET_OS_INCLUDE)/jni_md.h \ |
46 $(OPENJDK_TARGET_OS_INCLUDE)/jawt_md.h |
46 $(OPENJDK_TARGET_OS_INCLUDE)/jawt_md.h |
47 |
47 |
48 $(INCLUDEDIR)/%.h: $(JDK_TOPDIR)/src/share/javavm/export/%.h |
48 $(INCLUDEDIR)/%.h: $(JDK_TOPDIR)/src/share/javavm/export/%.h |
49 $(call install-file) |
49 $(call install-file) |
50 |
50 |
51 $(OPENJDK_TARGET_OS_INCLUDE)/%.h: $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export/%.h |
51 $(OPENJDK_TARGET_OS_INCLUDE)/%.h: $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export/%.h |
143 |
143 |
144 COPY_FILES += $(CURSORS_DEST_DIR)/cursors.properties |
144 COPY_FILES += $(CURSORS_DEST_DIR)/cursors.properties |
145 |
145 |
146 CURSORS_LIB_SRC = $(JDK_TOPDIR)/src/share/lib/images/cursors |
146 CURSORS_LIB_SRC = $(JDK_TOPDIR)/src/share/lib/images/cursors |
147 ifeq ($(OPENJDK_TARGET_OS), windows) |
147 ifeq ($(OPENJDK_TARGET_OS), windows) |
148 CURSORS_SRC_FILES = $(CURSORS_LIB_SRC)/invalid32x32.gif $(wildcard $(CURSORS_LIB_SRC)/win32_*.gif) |
148 CURSORS_SRC_FILES = $(CURSORS_LIB_SRC)/invalid32x32.gif $(wildcard $(CURSORS_LIB_SRC)/win32_*.gif) |
149 else # OPENJDK_TARGET_OS |
149 else # OPENJDK_TARGET_OS |
150 CURSORS_SRC_FILES = $(CURSORS_LIB_SRC)/invalid32x32.gif $(wildcard $(CURSORS_LIB_SRC)/motif_*.gif) |
150 CURSORS_SRC_FILES = $(CURSORS_LIB_SRC)/invalid32x32.gif $(wildcard $(CURSORS_LIB_SRC)/motif_*.gif) |
151 endif # OPENJDK_TARGET_OS |
151 endif # OPENJDK_TARGET_OS |
152 CURSORS_TARGET_FILES = $(subst $(CURSORS_LIB_SRC),$(CURSORS_DEST_DIR),$(CURSORS_SRC_FILES)) |
152 CURSORS_TARGET_FILES = $(subst $(CURSORS_LIB_SRC),$(CURSORS_DEST_DIR),$(CURSORS_SRC_FILES)) |
153 |
153 |
154 $(CURSORS_DEST_DIR)/%: $(CURSORS_LIB_SRC)/% |
154 $(CURSORS_DEST_DIR)/%: $(CURSORS_LIB_SRC)/% |
155 $(call install-file) |
155 $(call install-file) |
156 |
156 |
157 COPY_FILES += $(CURSORS_TARGET_FILES) |
157 COPY_FILES += $(CURSORS_TARGET_FILES) |
158 |
158 |
159 ########################################################################################## |
159 ########################################################################################## |
160 |
160 |
161 CONTENT_TYPES_SRC=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib |
161 CONTENT_TYPES_SRC = $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib |
162 |
162 |
163 $(LIBDIR)/content-types.properties: $(CONTENT_TYPES_SRC)/content-types.properties |
163 $(LIBDIR)/content-types.properties: $(CONTENT_TYPES_SRC)/content-types.properties |
164 $(call install-file) |
164 $(call install-file) |
165 |
165 |
166 COPY_FILES += $(LIBDIR)/content-types.properties |
166 COPY_FILES += $(LIBDIR)/content-types.properties |
181 |
181 |
182 COPY_FILES += $(LIBDIR)/hijrah-config-umalqura.properties |
182 COPY_FILES += $(LIBDIR)/hijrah-config-umalqura.properties |
183 |
183 |
184 ########################################################################################## |
184 ########################################################################################## |
185 |
185 |
186 ifeq ($(OPENJDK_TARGET_OS),windows) |
186 ifeq ($(OPENJDK_TARGET_OS), windows) |
187 |
187 |
188 TZMAPPINGS_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib |
188 TZMAPPINGS_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib |
189 |
189 |
190 $(LIBDIR)/tzmappings: $(TZMAPPINGS_SRC)/tzmappings |
190 $(LIBDIR)/tzmappings: $(TZMAPPINGS_SRC)/tzmappings |
191 $(call install-file) |
191 $(call install-file) |
192 |
192 |
193 COPY_FILES += $(LIBDIR)/tzmappings |
193 COPY_FILES += $(LIBDIR)/tzmappings |
194 |
194 |
195 endif |
195 endif |
196 |
196 |
197 ########################################################################################## |
197 ########################################################################################## |
198 |
198 |
199 ICCPROFILE_DEST_DIR := $(LIBDIR)/cmm |
199 ICCPROFILE_DEST_DIR := $(LIBDIR)/cmm |
200 |
200 |
201 ifdef OPENJDK |
201 ifdef OPENJDK |
202 ICCPROFILE_SRC_DIR := $(JDK_TOPDIR)/src/share/lib/cmm/lcms |
202 ICCPROFILE_SRC_DIR := $(JDK_TOPDIR)/src/share/lib/cmm/lcms |
203 else |
203 else |
204 ICCPROFILE_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/cmm/kcms |
204 ICCPROFILE_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/cmm/kcms |
205 endif |
205 endif |
206 |
206 |
207 ICCPROFILE_SRCS:=$(wildcard $(ICCPROFILE_SRC_DIR)/*.pf) |
207 ICCPROFILE_SRCS := $(wildcard $(ICCPROFILE_SRC_DIR)/*.pf) |
208 ICCPROFILE_TARGET_FILES:=$(subst $(ICCPROFILE_SRC_DIR),$(ICCPROFILE_DEST_DIR),$(ICCPROFILE_SRCS)) |
208 ICCPROFILE_TARGET_FILES := $(subst $(ICCPROFILE_SRC_DIR),$(ICCPROFILE_DEST_DIR),$(ICCPROFILE_SRCS)) |
209 |
209 |
210 $(ICCPROFILE_DEST_DIR)%.pf: $(ICCPROFILE_SRC_DIR)%.pf |
210 $(ICCPROFILE_DEST_DIR)%.pf: $(ICCPROFILE_SRC_DIR)%.pf |
211 $(call install-file) |
211 $(call install-file) |
212 $(CHMOD) 444 $@ |
212 $(CHMOD) 444 $@ |
213 |
213 |
214 COPY_FILES += $(ICCPROFILE_TARGET_FILES) |
214 COPY_FILES += $(ICCPROFILE_TARGET_FILES) |
215 |
215 |
216 ########################################################################################## |
216 ########################################################################################## |
217 |
217 |
218 #make sure freetype dll will be available at runtime as well as link time |
218 # make sure freetype dll will be available at runtime as well as link time |
219 # |
219 # |
220 #NB: Default freetype build system uses -h linker option and |
220 # NB: Default freetype build system uses -h linker option and |
221 # result .so contains hardcoded library name that is later |
221 # result .so contains hardcoded library name that is later |
222 # used for adding dependencies to other objects |
222 # used for adding dependencies to other objects |
223 # (e.g. libfontmanager.so). |
223 # (e.g. libfontmanager.so). |
224 # |
224 # |
225 # It is not obvious how to extract that hardcoded name (libfreetype.so.6) |
225 # It is not obvious how to extract that hardcoded name (libfreetype.so.6) |
226 # without overcomplicating logic here. |
226 # without overcomplicating logic here. |
227 # To workaround this we hardcode .6 suffix for now. |
227 # To workaround this we hardcode .6 suffix for now. |
228 # |
228 # |
229 # Note that .so.6 library will not be found by System.loadLibrary() |
229 # Note that .so.6 library will not be found by System.loadLibrary() |
230 # but fortunately we need to load FreeType library explicitly |
230 # but fortunately we need to load FreeType library explicitly |
231 # on windows only |
231 # on windows only |
232 # |
232 # |
233 #TODO: rework this to avoid hardcoding library name in the makefile |
233 #TODO: rework this to avoid hardcoding library name in the makefile |
234 # |
234 # |
235 ifdef OPENJDK |
235 ifdef OPENJDK |
236 ifeq ($(OPENJDK_TARGET_OS), windows) |
236 ifeq ($(OPENJDK_TARGET_OS), windows) |
237 FREETYPE_LIB = $(JDK_OUTPUTDIR)/bin/$(call SHARED_LIBRARY,freetype) |
237 FREETYPE_LIB = $(JDK_OUTPUTDIR)/bin/$(call SHARED_LIBRARY,freetype) |
238 else |
238 else |
239 ifeq ($(USING_SYSTEM_FT_LIB), false) |
239 ifeq ($(USING_SYSTEM_FT_LIB), false) |
240 FREETYPE_LIB = $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6 |
240 FREETYPE_LIB = $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6 |
|
241 endif |
|
242 endif |
|
243 |
|
244 $(FREETYPE_LIB): $(FREETYPE2_LIB_PATH)/$(call SHARED_LIBRARY,freetype) |
|
245 $(CP) $(FREETYPE2_LIB_PATH)/$(call SHARED_LIBRARY,freetype) $@ |
|
246 ifeq ($(OPENJDK_BUILD_OS), windows) |
|
247 $(CHMOD) +rx $@ |
241 endif |
248 endif |
242 endif |
249 |
243 |
250 COPY_FILES += $(FREETYPE_LIB) |
244 $(FREETYPE_LIB): $(FREETYPE2_LIB_PATH)/$(call SHARED_LIBRARY,freetype) |
|
245 $(CP) $(FREETYPE2_LIB_PATH)/$(call SHARED_LIBRARY,freetype) $@ |
|
246 ifeq ($(OPENJDK_BUILD_OS), windows) |
|
247 $(CHMOD) +rx $@ |
|
248 endif |
|
249 |
|
250 COPY_FILES += $(FREETYPE_LIB) |
|
251 endif |
251 endif |
252 |
252 |
253 ########################################################################################## |
253 ########################################################################################## |
254 |
254 |
255 # Copy msvcrXX.dll on windows |
255 # Copy msvcrXX.dll on windows |
256 |
256 |
257 ifeq ($(OPENJDK_TARGET_OS),windows) |
257 ifeq ($(OPENJDK_TARGET_OS), windows) |
258 MSVCR_TARGET := $(JDK_OUTPUTDIR)/bin/$(notdir $(MSVCR_DLL)) |
258 MSVCR_TARGET := $(JDK_OUTPUTDIR)/bin/$(notdir $(MSVCR_DLL)) |
259 # Chmod to avoid permission issues if bundles are unpacked on unix platforms. |
259 # Chmod to avoid permission issues if bundles are unpacked on unix platforms. |
260 $(MSVCR_TARGET): $(MSVCR_DLL) |
260 $(MSVCR_TARGET): $(MSVCR_DLL) |
261 $(call install-file) |
261 $(call install-file) |
262 $(CHMOD) a+rx $@ |
262 $(CHMOD) a+rx $@ |
263 |
263 |
264 COPY_FILES += $(MSVCR_TARGET) |
264 COPY_FILES += $(MSVCR_TARGET) |
265 endif |
265 endif |
266 |
266 |
267 ########################################################################################## |
267 ########################################################################################## |
268 |
268 |
269 HPROF_SRC=$(JDK_TOPDIR)/src/share/demo/jvmti/hprof/jvm.hprof.txt |
269 HPROF_SRC = $(JDK_TOPDIR)/src/share/demo/jvmti/hprof/jvm.hprof.txt |
270 |
270 |
271 $(LIBDIR)/jvm.hprof.txt : $(HPROF_SRC) |
271 $(LIBDIR)/jvm.hprof.txt: $(HPROF_SRC) |
272 $(call install-file) |
272 $(call install-file) |
273 |
273 |
274 COPY_FILES += $(LIBDIR)/jvm.hprof.txt |
274 COPY_FILES += $(LIBDIR)/jvm.hprof.txt |
275 |
275 |
276 ########################################################################################## |
276 ########################################################################################## |
277 |
277 |
278 # |
278 # |
279 # How to install jvm.cfg. |
279 # How to install jvm.cfg. |
280 # |
280 # |
281 ifeq ($(JVM_VARIANT_ZERO), true) |
281 ifeq ($(JVM_VARIANT_ZERO), true) |
282 JVMCFG_ARCH := zero |
282 JVMCFG_ARCH := zero |
283 else |
283 else |
284 JVMCFG_ARCH := $(OPENJDK_TARGET_CPU_LEGACY) |
284 JVMCFG_ARCH := $(OPENJDK_TARGET_CPU_LEGACY) |
285 endif |
285 endif |
286 |
286 |
287 ifeq ($(OPENJDK_TARGET_OS),macosx) |
287 ifeq ($(OPENJDK_TARGET_OS), macosx) |
288 JVMCFG_SRC := $(JDK_TOPDIR)/src/macosx/bin/$(JVMCFG_ARCH)/jvm.cfg |
288 JVMCFG_SRC := $(JDK_TOPDIR)/src/macosx/bin/$(JVMCFG_ARCH)/jvm.cfg |
289 else |
289 else |
290 JVMCFG_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(JVMCFG_ARCH)/jvm.cfg |
290 JVMCFG_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(JVMCFG_ARCH)/jvm.cfg |
291 endif |
291 endif |
292 JVMCFG_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR) |
292 JVMCFG_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR) |
293 JVMCFG := $(JVMCFG_DIR)/jvm.cfg |
293 JVMCFG := $(JVMCFG_DIR)/jvm.cfg |
294 |
294 |
295 # To do: should this also support -zeroshark? |
295 # To do: should this also support -zeroshark? |
296 |
296 |
297 ifeq ($(OPENJDK_TARGET_CPU_BITS),64) |
297 ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) |
298 COPY_JVM_CFG_FILE := true |
298 COPY_JVM_CFG_FILE := true |
299 else |
299 else |
300 # On 32-bit machines we have three potential VMs: client, server and minimal. |
300 # On 32-bit machines we have three potential VMs: client, server and minimal. |
301 # Historically we usually have both client and server and so that is what the |
301 # Historically we usually have both client and server and so that is what the |
302 # committed jvm.cfg expects (including platform specific ergonomics switches |
302 # committed jvm.cfg expects (including platform specific ergonomics switches |
303 # to decide whether to use client or server by default). So when we have anything |
303 # to decide whether to use client or server by default). So when we have anything |
304 # other than client and server we need to define a new jvm.cfg file. |
304 # other than client and server we need to define a new jvm.cfg file. |
305 # The main problem is deciding whether to use aliases for the VMs that are not |
305 # The main problem is deciding whether to use aliases for the VMs that are not |
306 # present and the current position is that we add aliases for client and server, but |
306 # present and the current position is that we add aliases for client and server, but |
307 # not for minimal. |
307 # not for minimal. |
308 CLIENT_AND_SERVER := $(and $(findstring true,$(JVM_VARIANT_SERVER)),$(findstring true,$(JVM_VARIANT_CLIENT))) |
308 CLIENT_AND_SERVER := $(and $(findstring true, $(JVM_VARIANT_SERVER)), $(findstring true, $(JVM_VARIANT_CLIENT))) |
309 ifeq ($(CLIENT_AND_SERVER), true) |
309 ifeq ($(CLIENT_AND_SERVER), true) |
310 COPY_JVM_CFG_FILE := true |
310 COPY_JVM_CFG_FILE := true |
311 else |
311 else |
312 # For zero, the default jvm.cfg file is sufficient |
312 # For zero, the default jvm.cfg file is sufficient |
313 ifeq ($(JVM_VARIANT_ZERO), true) |
313 ifeq ($(JVM_VARIANT_ZERO), true) |
315 endif |
315 endif |
316 endif |
316 endif |
317 endif |
317 endif |
318 |
318 |
319 ifeq ($(COPY_JVM_CFG_FILE), true) |
319 ifeq ($(COPY_JVM_CFG_FILE), true) |
320 $(JVMCFG): $(JVMCFG_SRC) |
320 $(JVMCFG): $(JVMCFG_SRC) |
321 $(call install-file) |
321 $(call install-file) |
322 else |
322 else |
323 $(JVMCFG): |
323 $(JVMCFG): |
324 $(MKDIR) -p $(@D) |
324 $(MKDIR) -p $(@D) |
325 $(RM) $(@) |
325 $(RM) $(@) |
326 |
326 # Now check for other permutations |
327 # Now check for other permutations |
327 ifeq ($(JVM_VARIANT_SERVER), true) |
328 ifeq ($(JVM_VARIANT_SERVER), true) |
328 $(PRINTF) "-server KNOWN\n">>$(@) |
329 $(PRINTF) "-server KNOWN\n">>$(@) |
329 $(PRINTF) "-client ALIASED_TO -server\n">>$(@) |
330 $(PRINTF) "-client ALIASED_TO -server\n">>$(@) |
330 ifeq ($(JVM_VARIANT_MINIMAL1), true) |
331 ifeq ($(JVM_VARIANT_MINIMAL1), true) |
|
332 $(PRINTF) "-minimal KNOWN\n">>$(@) |
331 $(PRINTF) "-minimal KNOWN\n">>$(@) |
333 endif |
332 endif |
334 else |
333 else |
335 ifeq ($(JVM_VARIANT_CLIENT), true) |
334 ifeq ($(JVM_VARIANT_CLIENT), true) |
336 $(PRINTF) "-client KNOWN\n">>$(@) |
335 $(PRINTF) "-client KNOWN\n">>$(@) |
337 $(PRINTF) "-server ALIASED_TO -client\n">>$(@) |
336 $(PRINTF) "-server ALIASED_TO -client\n">>$(@) |
338 ifeq ($(JVM_VARIANT_MINIMAL1), true) |
337 ifeq ($(JVM_VARIANT_MINIMAL1), true) |
339 $(PRINTF) "-minimal KNOWN\n">>$(@) |
338 $(PRINTF) "-minimal KNOWN\n">>$(@) |
340 endif |
339 endif |
341 else |
340 else |
342 ifeq ($(JVM_VARIANT_MINIMAL1), true) |
341 ifeq ($(JVM_VARIANT_MINIMAL1), true) |
343 $(PRINTF) "-minimal KNOWN\n">>$(@) |
342 $(PRINTF) "-minimal KNOWN\n">>$(@) |
344 $(PRINTF) "-server ALIASED_TO -minimal\n">>$(@) |
343 $(PRINTF) "-server ALIASED_TO -minimal\n">>$(@) |
345 $(PRINTF) "-client ALIASED_TO -minimal\n">>$(@) |
344 $(PRINTF) "-client ALIASED_TO -minimal\n">>$(@) |
346 endif |
345 endif |
|
346 endif |
347 endif |
347 endif |
348 endif |
|
349 endif |
348 endif |
350 |
349 |
351 COPY_FILES += $(JVMCFG) |
350 COPY_FILES += $(JVMCFG) |
352 |
351 |
353 ########################################################################################## |
352 ########################################################################################## |
423 |
422 |
424 ########################################################################################## |
423 ########################################################################################## |
425 |
424 |
426 ifndef OPENJDK |
425 ifndef OPENJDK |
427 |
426 |
428 SHARED_FONTS_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/fonts |
427 SHARED_FONTS_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/fonts |
429 SHARED_FONTS_DST_DIR := $(JDK_OUTPUTDIR)/lib/fonts |
428 SHARED_FONTS_DST_DIR := $(JDK_OUTPUTDIR)/lib/fonts |
430 SHARED_FONTS_FILES := \ |
429 SHARED_FONTS_FILES := \ |
431 LucidaTypewriterRegular.ttf \ |
430 LucidaTypewriterRegular.ttf \ |
432 LucidaTypewriterBold.ttf \ |
431 LucidaTypewriterBold.ttf \ |
433 LucidaBrightRegular.ttf \ |
432 LucidaBrightRegular.ttf \ |
434 LucidaBrightDemiBold.ttf \ |
433 LucidaBrightDemiBold.ttf \ |
435 LucidaBrightItalic.ttf \ |
434 LucidaBrightItalic.ttf \ |
436 LucidaBrightDemiItalic.ttf \ |
435 LucidaBrightDemiItalic.ttf \ |
437 LucidaSansRegular.ttf \ |
436 LucidaSansRegular.ttf \ |
438 LucidaSansDemiBold.ttf \ |
437 LucidaSansDemiBold.ttf \ |
439 |
438 |
440 SHARED_FONTS_SRC := $(foreach F,$(SHARED_FONTS_FILES),$(SHARED_FONTS_SRC_DIR)/$(F)) |
439 SHARED_FONTS_SRC := $(foreach F, $(SHARED_FONTS_FILES), $(SHARED_FONTS_SRC_DIR)/$(F)) |
441 SHARED_FONTS_DST := $(foreach F,$(SHARED_FONTS_FILES),$(SHARED_FONTS_DST_DIR)/$(F)) |
440 SHARED_FONTS_DST := $(foreach F, $(SHARED_FONTS_FILES), $(SHARED_FONTS_DST_DIR)/$(F)) |
442 |
441 |
443 $(SHARED_FONTS_DST_DIR)/%.ttf : $(SHARED_FONTS_SRC_DIR)/%.ttf |
442 $(SHARED_FONTS_DST_DIR)/%.ttf: $(SHARED_FONTS_SRC_DIR)/%.ttf |
444 $(call install-file) |
443 $(call install-file) |
445 |
444 |
446 $(SHARED_FONTS_DST_DIR)/fonts.dir : $(JDK_TOPDIR)/src/solaris/classes/sun/awt/motif/java.fonts.dir |
445 $(SHARED_FONTS_DST_DIR)/fonts.dir: $(JDK_TOPDIR)/src/solaris/classes/sun/awt/motif/java.fonts.dir |
447 $(call install-file) |
446 $(call install-file) |
448 |
447 |
449 COPY_FILES += $(SHARED_FONTS_DST) |
448 COPY_FILES += $(SHARED_FONTS_DST) |
450 |
449 |
451 ifneq ($(OPENJDK_TARGET_OS), windows) |
450 ifneq ($(OPENJDK_TARGET_OS), windows) |
452 COPY_FILES += $(SHARED_FONTS_DST_DIR)/fonts.dir |
451 COPY_FILES += $(SHARED_FONTS_DST_DIR)/fonts.dir |
453 endif |
452 endif |
454 |
453 |
455 ifeq ($(OPENJDK_TARGET_OS), linux) |
454 ifeq ($(OPENJDK_TARGET_OS), linux) |
456 |
455 |
457 # The oblique fonts are only needed/wanted on Linux. |
456 # The oblique fonts are only needed/wanted on Linux. |
458 |
457 |
459 OBL_FONTS_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/fonts/oblique |
458 OBL_FONTS_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/fonts/oblique |
460 OBL_FONTS_DST_DIR := $(JDK_OUTPUTDIR)/lib/oblique-fonts |
459 OBL_FONTS_DST_DIR := $(JDK_OUTPUTDIR)/lib/oblique-fonts |
461 OBL_FONTS_FILES := LucidaTypewriterOblique.ttf LucidaTypewriterBoldOblique.ttf \ |
460 OBL_FONTS_FILES := LucidaTypewriterOblique.ttf LucidaTypewriterBoldOblique.ttf \ |
462 LucidaSansOblique.ttf LucidaSansDemiOblique.ttf |
461 LucidaSansOblique.ttf LucidaSansDemiOblique.ttf |
463 |
462 |
464 OBL_FONTS_SRC := $(foreach F,$(OBL_FONTS_FILES),$(OBL_FONTS_SRC_DIR)/$(F)) |
463 OBL_FONTS_SRC := $(foreach F, $(OBL_FONTS_FILES), $(OBL_FONTS_SRC_DIR)/$(F)) |
465 OBL_FONTS_DST := $(foreach F,$(OBL_FONTS_FILES),$(OBL_FONTS_DST_DIR)/$(F)) |
464 OBL_FONTS_DST := $(foreach F, $(OBL_FONTS_FILES), $(OBL_FONTS_DST_DIR)/$(F)) |
466 |
465 |
467 $(OBL_FONTS_DST_DIR)/%.ttf : $(OBL_FONTS_SRC_DIR)/%.ttf |
466 $(OBL_FONTS_DST_DIR)/%.ttf: $(OBL_FONTS_SRC_DIR)/%.ttf |
468 $(call install-file) |
467 $(call install-file) |
469 |
468 |
470 $(OBL_FONTS_DST_DIR)/fonts.dir : $(JDK_TOPDIR)/src/solaris/classes/sun/awt/motif/java.oblique-fonts.dir |
469 $(OBL_FONTS_DST_DIR)/fonts.dir: $(JDK_TOPDIR)/src/solaris/classes/sun/awt/motif/java.oblique-fonts.dir |
471 $(call install-file) |
470 $(call install-file) |
472 |
471 |
473 COPY_FILES += $(OBL_FONTS_DST) $(OBL_FONTS_DST_DIR)/fonts.dir |
472 COPY_FILES += $(OBL_FONTS_DST) $(OBL_FONTS_DST_DIR)/fonts.dir |
474 |
473 |
475 endif # linux |
474 endif # linux |
476 endif # OPENJDK |
475 endif # OPENJDK |
477 |
476 |
478 ########################################################################################## |
477 ########################################################################################## |
479 |
478 |
480 ifndef OPENJDK |
479 ifndef OPENJDK |
481 |
480 |
482 # |
481 # |
483 # Solaris X11 Direct Graphics Access library |
482 # Solaris X11 Direct Graphics Access library |
484 # |
483 # |
485 |
484 |
486 _DGALIBS_sparc = \ |
485 _DGALIBS_sparc = \ |
487 libxinerama.so \ |
486 libxinerama.so \ |
488 libjdgaSUNWcg6.so \ |
487 libjdgaSUNWcg6.so \ |
489 libjdgaSUNWffb.so \ |
488 libjdgaSUNWffb.so \ |
490 libjdgaSUNWm64.so \ |
489 libjdgaSUNWm64.so \ |
491 libjdgaSUNWafb.so |
490 libjdgaSUNWafb.so |
492 |
491 |
493 _DGALIBS_sparcv9 = \ |
492 _DGALIBS_sparcv9 = \ |
494 libxinerama.so \ |
493 libxinerama.so \ |
495 libjdgaSUNWcg6.so \ |
494 libjdgaSUNWcg6.so \ |
496 libjdgaSUNWffb.so \ |
495 libjdgaSUNWffb.so \ |
497 libjdgaSUNWm64.so \ |
496 libjdgaSUNWm64.so \ |
498 libjdgaSUNWafb.so |
497 libjdgaSUNWafb.so |
499 |
498 |
500 _DGALIBS_i586 = # no i586 library yet |
499 _DGALIBS_i586 = # no i586 library yet |
501 |
500 |
502 _DGALIBS_amd64 = # no amd64 library yet |
501 _DGALIBS_amd64 = # no amd64 library yet |
503 |
502 |
504 DGALIBS = $(_DGALIBS_$(OPENJDK_TARGET_CPU_LEGACY):%=$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/%) |
503 DGALIBS = $(_DGALIBS_$(OPENJDK_TARGET_CPU_LEGACY):%=$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/%) |
505 |
504 |
506 $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libxinerama.so: $(JDK_TOPDIR)/src/closed/solaris/lib/$(OPENJDK_TARGET_CPU_LEGACY)/libxinerama.so |
505 $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libxinerama.so: $(JDK_TOPDIR)/src/closed/solaris/lib/$(OPENJDK_TARGET_CPU_LEGACY)/libxinerama.so |
507 $(call install-file) |
506 $(call install-file) |
508 $(CHMOD) 755 $@ |
507 $(CHMOD) 755 $@ |
509 |
508 |
510 $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNW%.so: $(JDK_TOPDIR)/src/closed/solaris/lib/$(OPENJDK_TARGET_CPU_LEGACY)/libjdgaSUNW%.so |
509 $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNW%.so: $(JDK_TOPDIR)/src/closed/solaris/lib/$(OPENJDK_TARGET_CPU_LEGACY)/libjdgaSUNW%.so |
511 $(call install-file) |
510 $(call install-file) |
512 $(CHMOD) 755 $@ |
511 $(CHMOD) 755 $@ |
513 |
512 |
514 $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNWafb.so: $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNWffb.so |
513 $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNWafb.so: $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNWffb.so |
515 $(MKDIR) -p $(@D) |
514 $(MKDIR) -p $(@D) |
516 $(RM) $@ |
515 $(RM) $@ |
517 $(LN) -s $(<F) $@ |
516 $(LN) -s $(<F) $@ |
518 |
517 |
519 COPY_FILES += $(DGALIBS) |
518 COPY_FILES += $(DGALIBS) |
520 |
519 |
521 endif |
520 endif |
522 |
521 |
523 ########################################################################################## |
522 ########################################################################################## |
524 |
523 |
525 ifeq ($(OPENJDK_TARGET_OS), solaris) |
524 ifeq ($(OPENJDK_TARGET_OS), solaris) |
526 |
525 |
527 SUNPKCS11_CFG_SRC := $(JDK_TOPDIR)/src/share/lib/security/sunpkcs11-solaris.cfg |
526 SUNPKCS11_CFG_SRC := $(JDK_TOPDIR)/src/share/lib/security/sunpkcs11-solaris.cfg |
528 SUNPKCS11_CFG_DST := $(JDK_OUTPUTDIR)/lib/security/sunpkcs11-solaris.cfg |
527 SUNPKCS11_CFG_DST := $(JDK_OUTPUTDIR)/lib/security/sunpkcs11-solaris.cfg |
529 |
528 |
530 $(SUNPKCS11_CFG_DST) : $(SUNPKCS11_CFG_SRC) |
529 $(SUNPKCS11_CFG_DST): $(SUNPKCS11_CFG_SRC) |
531 $(call install-file) |
530 $(call install-file) |
532 |
531 |
533 COPY_FILES += $(SUNPKCS11_CFG_DST) |
532 COPY_FILES += $(SUNPKCS11_CFG_DST) |
534 |
533 |
535 endif |
534 endif |
536 |
535 |
537 ########################################################################################## |
536 ########################################################################################## |
538 |
537 |
539 ifndef OPENJDK |
538 ifndef OPENJDK |
540 ifeq ($(OPENJDK_TARGET_OS), solaris) |
539 ifeq ($(OPENJDK_TARGET_OS), solaris) |
541 |
540 |
542 UCRYPTO_CFG_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/ucrypto-solaris.cfg |
541 UCRYPTO_CFG_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/ucrypto-solaris.cfg |
543 UCRYPTO_CFG_DST := $(JDK_OUTPUTDIR)/lib/security/ucrypto-solaris.cfg |
542 UCRYPTO_CFG_DST := $(JDK_OUTPUTDIR)/lib/security/ucrypto-solaris.cfg |
544 |
543 |
545 $(UCRYPTO_CFG_DST) : $(UCRYPTO_CFG_SRC) |
544 $(UCRYPTO_CFG_DST): $(UCRYPTO_CFG_SRC) |
546 $(call install-file) |
545 $(call install-file) |
547 |
546 |
548 COPY_FILES += $(UCRYPTO_CFG_DST) |
547 COPY_FILES += $(UCRYPTO_CFG_DST) |
549 |
548 |
550 endif |
549 endif |
551 endif |
550 endif |
552 |
551 |
553 ########################################################################################## |
552 ########################################################################################## |
554 |
553 |
555 $(JDK_OUTPUTDIR)/lib/sound.properties : $(JDK_TOPDIR)/src/share/lib/sound.properties |
554 $(JDK_OUTPUTDIR)/lib/sound.properties: $(JDK_TOPDIR)/src/share/lib/sound.properties |
556 $(call install-file) |
555 $(call install-file) |
557 |
556 |
558 COPY_FILES += $(JDK_OUTPUTDIR)/lib/sound.properties |
557 COPY_FILES += $(JDK_OUTPUTDIR)/lib/sound.properties |
559 |
558 |
560 ########################################################################################## |
559 ########################################################################################## |