jdk/makefiles/GensrcX11Wrappers.gmk
changeset 13164 72c5d01a857d
parent 12892 3ef14bab6254
child 13702 efd6a05935b2
equal deleted inserted replaced
13082:9b19b2302c28 13164:72c5d01a857d
    28 
    28 
    29 GENSRC_SIZER_SRC := $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator
    29 GENSRC_SIZER_SRC := $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator
    30 
    30 
    31 GENSRC_SIZES :=
    31 GENSRC_SIZES :=
    32 
    32 
    33 ifeq ($(PLATFORM)-$(LIBARCH), solaris-i386)
    33 ifeq ($(OPENJDK_TARGET_OS)-$(LIBARCH), solaris-i386)
    34 GENSRC_SIZES := sizes.32 sizes.64
    34 GENSRC_SIZES := sizes.32 sizes.64
    35 else ifeq ($(PLATFORM), solaris)
    35 else ifeq ($(OPENJDK_TARGET_OS), solaris)
    36 isalist:=$(shell $(ISAINFO))
    36 isalist:=$(shell isainfo)
    37 ifneq (,$(findstring sparcv9, $(isalist)))
    37 ifneq (,$(findstring sparcv9, $(isalist)))
    38 # On sparcv9 we generate both 32 and 64-bit sizers in spite of ARCH_DATA_MODEL.
    38 # On sparcv9 we generate both 32 and 64-bit sizers in spite of ARCH_DATA_MODEL.
    39 GENSRC_SIZES := sizes.32 sizes.64
    39 GENSRC_SIZES := sizes.32 sizes.64
    40 else
    40 else
    41 ifneq (,$(findstring amd64, $(isalist)))
    41 ifneq (,$(findstring amd64, $(isalist)))
    44 else # !sparcv9 : includes (32-bit) sparc, i586
    44 else # !sparcv9 : includes (32-bit) sparc, i586
    45 GENSRC_SIZES := sizes.32
    45 GENSRC_SIZES := sizes.32
    46 endif # amd64
    46 endif # amd64
    47 endif # sparcv9
    47 endif # sparcv9
    48 else # !solaris
    48 else # !solaris
    49 ifeq ($(PLATFORM), macosx)
    49 ifeq ($(OPENJDK_TARGET_OS), macosx)
    50 GENSRC_SIZES := sizes.32 sizes.64
    50 GENSRC_SIZES := sizes.32 sizes.64
    51 else # !macosx
    51 else # !macosx
    52 GENSRC_SIZES := sizes.$(ARCH_DATA_MODEL)
    52 GENSRC_SIZES := sizes.$(ARCH_DATA_MODEL)
    53 endif # !macosx
    53 endif # !macosx
    54 endif # solaris
    54 endif # solaris
    60 	$(MKDIR) -p $(@D)
    60 	$(MKDIR) -p $(@D)
    61 	$(RM) $@
    61 	$(RM) $@
    62 	$(TOOL_WRAPPERGENERATOR) $(@D) $< "sizer" $*
    62 	$(TOOL_WRAPPERGENERATOR) $(@D) $< "sizer" $*
    63 
    63 
    64 $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.exe : $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.c
    64 $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.exe : $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.c
    65 	(cd $(@D) && $(CC) -m$* -o $@ $< $(CFLAGS_JDKLIB) \
    65 	(cd $(@D) && $(HOST_CC) -m$* -o $@ $< \
       
    66               -I$(JDK_OUTPUTDIR)/include \
       
    67               -I$(JDK_TOPDIR)/src/share/javavm/export \
       
    68               -I$(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/javavm/export \
       
    69               -I$(JDK_TOPDIR)//src/share/native/common \
       
    70               -I$(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/native/common \
    66               -I$(JDK_TOPDIR)/src/solaris/native/sun/awt \
    71               -I$(JDK_TOPDIR)/src/solaris/native/sun/awt \
    67 	      -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
    72 	      -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
    68 	      -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils -lc)
    73 	      -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils -lc)
    69 
    74 
    70 ifeq ($(PLATFORM)-$(LIBARCH), solaris-i386)
    75 ifeq ($(OPENJDK_TARGET_OS)-$(LIBARCH), solaris-i386)
    71 
    76 
    72 $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.32 : $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.32.exe
    77 $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.32 : $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.32.exe
    73 	$< > $@.tmp
    78 	$< > $@.tmp
    74 	$(MV) $@.tmp $@
    79 	$(MV) $@.tmp $@
    75 
    80 
    76 $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.64 : $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/classes/sun/awt/X11/generator/sizes.64-$(PLATFORM)-$(LIBARCH)
    81 $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.64 : $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/classes/sun/awt/X11/generator/sizes.64-$(OPENJDK_TARGET_OS)-$(LIBARCH)
    77 	$(MKDIR) -p $(@D)
    82 	$(MKDIR) -p $(@D)
    78 	$(CP) $< $@
    83 	$(CP) $< $@
    79 else
    84 else
    80 
    85 
    81 $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.% : $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.exe
    86 $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.% : $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.exe
    86 
    91 
    87 $(GENSRC_X11WRAPPERS_TMP)/classes/_the.classes : $(foreach S,$(GENSRC_SIZES),$(GENSRC_X11WRAPPERS_TMP)/sizer/$(S))
    92 $(GENSRC_X11WRAPPERS_TMP)/classes/_the.classes : $(foreach S,$(GENSRC_SIZES),$(GENSRC_X11WRAPPERS_TMP)/sizer/$(S))
    88 	$(MKDIR) -p $(@D)/sun/awt/X11
    93 	$(MKDIR) -p $(@D)/sun/awt/X11
    89 	$(RM) $(@D)/sun/awt/X11/*
    94 	$(RM) $(@D)/sun/awt/X11/*
    90 	$(TOOL_WRAPPERGENERATOR) $(@D)/sun/awt/X11 $(GENSRC_SIZER_SRC)/xlibtypes.txt "gen" $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes
    95 	$(TOOL_WRAPPERGENERATOR) $(@D)/sun/awt/X11 $(GENSRC_SIZER_SRC)/xlibtypes.txt "gen" $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes
    91 ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
    96 ifeq ($(OPENJDK_TARGET_OS)-$(LIBARCH), solaris-amd64)
    92 	$(ECHO) COMPARING $@ and $(GENSRC_SIZER_SRC)/sizes.64-$(PLATFORM)-i386
    97 	$(ECHO) COMPARING $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.64 and $(GENSRC_SIZER_SRC)/sizes.64-$(OPENJDK_TARGET_OS)-i386
    93 	$(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizes.64 $(GENSRC_SIZER_SRC)/sizes.64-$(PLATFORM)-i386
    98 	$(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.64 $(GENSRC_SIZER_SRC)/sizes.64-$(OPENJDK_TARGET_OS)-i386
    94 endif
    99 endif
    95 	$(TOUCH) $@
   100 	$(TOUCH) $@
    96 
   101 
    97 GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_TMP)/classes/_the.classes
   102 GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_TMP)/classes/_the.classes