33 # Put the generated Java classes used to interface X11 from awt here. |
33 # Put the generated Java classes used to interface X11 from awt here. |
34 GENSRC_X11WRAPPERS_OUTPUTDIR := $(GENSRC_X11WRAPPERS_OUTPUT_TOP)/sun/awt/X11 |
34 GENSRC_X11WRAPPERS_OUTPUTDIR := $(GENSRC_X11WRAPPERS_OUTPUT_TOP)/sun/awt/X11 |
35 |
35 |
36 # The pre-calculated offset file are stored here: |
36 # The pre-calculated offset file are stored here: |
37 GENSRC_X11WRAPPERS_DATADIR := $(TOPDIR)/make/data/x11wrappergen |
37 GENSRC_X11WRAPPERS_DATADIR := $(TOPDIR)/make/data/x11wrappergen |
|
38 GENSRC_X11WRAPPERS_DATA := $(GENSRC_X11WRAPPERS_DATADIR)/sizes-$(OPENJDK_TARGET_CPU_BITS).txt |
38 |
39 |
39 # Always generate 64-bit version on 64-bit systems. |
40 # Always generate 64-bit version on 64-bit systems. |
40 # Always generate 32-bit version on 32-bit systems. |
41 # Always generate 32-bit version on 32-bit systems. |
41 # On all 64-bit systems, except Linux, also generate 32-bit version. |
42 # On all 64-bit systems, except Linux, also generate 32-bit version. |
42 ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) |
|
43 GENSRC_X11WRAPPERS_DATA_64 = $(GENSRC_X11WRAPPERS_DATADIR)/sizes-64.txt |
43 GENSRC_X11WRAPPERS_DATA_64 = $(GENSRC_X11WRAPPERS_DATADIR)/sizes-64.txt |
44 ifneq ($(OPENJDK_TARGET_OS), linux) |
|
45 GENSRC_X11WRAPPERS_DATA_32 = $(GENSRC_X11WRAPPERS_DATADIR)/sizes-32.txt |
44 GENSRC_X11WRAPPERS_DATA_32 = $(GENSRC_X11WRAPPERS_DATADIR)/sizes-32.txt |
46 else |
45 else |
47 GENSRC_X11WRAPPERS_DATA_32 = IGNORE |
46 GENSRC_X11WRAPPERS_DATA_32 = IGNORE |
48 endif |
|
49 else |
|
50 GENSRC_X11WRAPPERS_DATA_64 = IGNORE |
47 GENSRC_X11WRAPPERS_DATA_64 = IGNORE |
51 GENSRC_X11WRAPPERS_DATA_32 = $(GENSRC_X11WRAPPERS_DATADIR)/sizes-32.txt |
48 GENSRC_X11WRAPPERS_DATA_32 = $(GENSRC_X11WRAPPERS_DATADIR)/sizes-32.txt |
52 endif |
|
53 |
|
54 # Make something we can depend on |
49 # Make something we can depend on |
55 GENSRC_X11WRAPPERS_DATAFILES := $(GENSRC_X11WRAPPERS_DATADIR)/xlibtypes.txt \ |
50 GENSRC_X11WRAPPERS_DATAFILES := $(GENSRC_X11WRAPPERS_DATADIR)/xlibtypes.txt \ |
56 $(filter-out IGNORE, $(GENSRC_X11WRAPPERS_DATA_32) $(GENSRC_X11WRAPPERS_DATA_64)) |
51 $(filter-out IGNORE, $(GENSRC_X11WRAPPERS_DATA_32) $(GENSRC_X11WRAPPERS_DATA_64)) |
57 |
|
58 # Run the tool on the offset files to generate several Java classes used in awt. |
52 # Run the tool on the offset files to generate several Java classes used in awt. |
59 $(GENSRC_X11WRAPPERS_MARKER): $(BUILD_TOOLS_JDK) $(GENSRC_X11WRAPPERS_DATAFILES) |
53 $(GENSRC_X11WRAPPERS_MARKER): $(BUILD_TOOLS_JDK) $(GENSRC_X11WRAPPERS_DATA) \ |
|
54 $(GENSRC_X11WRAPPERS_DATADIR)/xlibtypes.txt |
60 $(call MakeDir, $(GENSRC_X11WRAPPERS_OUTPUTDIR)) |
55 $(call MakeDir, $(GENSRC_X11WRAPPERS_OUTPUTDIR)) |
61 $(call LogInfo, Generating X11 wrapper source files) |
56 $(call LogInfo, Generating X11 wrapper source files) |
62 $(TOOL_WRAPPERGENERATOR) gen_java $(GENSRC_X11WRAPPERS_OUTPUTDIR) $(GENSRC_X11WRAPPERS_DATADIR)/xlibtypes.txt $(GENSRC_X11WRAPPERS_DATA_32) $(GENSRC_X11WRAPPERS_DATA_64) |
|
63 $(TOUCH) $@ |
57 $(TOUCH) $@ |
64 |
58 |
65 GENSRC_JAVA_DESKTOP += $(GENSRC_X11WRAPPERS_MARKER) |
59 GENSRC_JAVA_DESKTOP += $(GENSRC_X11WRAPPERS_MARKER) |