jdk/make/sun/awt/mawt.gmk
changeset 11093 e753252dc8a9
parent 9002 6ee0abf0167f
child 12047 320a714614e9
equal deleted inserted replaced
11092:6c49e728d427 11093:e753252dc8a9
    39 include $(BUILDDIR)/sun/awt/FILES_export_unix.gmk
    39 include $(BUILDDIR)/sun/awt/FILES_export_unix.gmk
    40 
    40 
    41 # Check which C files should be built.  Headless uses only
    41 # Check which C files should be built.  Headless uses only
    42 # non-motif files.  Also, a version-specific motif file is
    42 # non-motif files.  Also, a version-specific motif file is
    43 # compiled based on the motif version.
    43 # compiled based on the motif version.
    44 ifdef HEADLESS
    44 FILES_c = $(FILES_NO_MOTIF_c)
    45   FILES_c = $(FILES_NO_MOTIF_c)
       
    46 else
       
    47 #  FILES_c = $(FILES_MOTIF_c) $(FILES_NO_MOTIF_c)
       
    48 #  XXX if in FILES_MOTIF_c there are unrelated to motif stuff, create a separate list!
       
    49   FILES_c = $(FILES_NO_MOTIF_c)
       
    50 endif
       
    51 
    45 
    52 ifeq ($(PLATFORM), solaris)
    46 ifeq ($(PLATFORM), solaris)
    53   ifneq ($(ARCH), amd64)
    47   ifneq ($(ARCH), amd64)
    54     FILES_reorder += reorder-$(ARCH)
    48     FILES_reorder += reorder-$(ARCH)
    55   endif
    49   endif
   114 ifeq ($(HEADLESS),true)
   108 ifeq ($(HEADLESS),true)
   115 CFLAGS += -DHEADLESS=$(HEADLESS)
   109 CFLAGS += -DHEADLESS=$(HEADLESS)
   116 CPPFLAGS += -DHEADLESS=$(HEADLESS)
   110 CPPFLAGS += -DHEADLESS=$(HEADLESS)
   117 OTHER_LDLIBS =
   111 OTHER_LDLIBS =
   118 else
   112 else
   119 #CFLAGS += -DMOTIF_VERSION=$(MOTIF_VERSION)
       
   120 
       
   121 #ifeq ($(STATIC_MOTIF),true)
       
   122 #    LIBXM = $(MOTIF_LIB)/libXm.a -lXp -lXmu
       
   123 #    ifeq ($(PLATFORM), linux)
       
   124 #	ifeq ($(ARCH_DATA_MODEL), 64)
       
   125 #            LIBXT = -lXt
       
   126 #        else
       
   127 #        # Allows for builds on Debian GNU Linux, X11 is in a different place 
       
   128 #	    LIBXT = $(firstword $(wildcard /usr/X11R6/lib/libXt.a) \
       
   129 #                            $(wildcard /usr/lib/libXt.a))
       
   130 #	    LIBSM = $(firstword $(wildcard /usr/X11R6/lib/libSM.a) \
       
   131 #                            $(wildcard /usr/lib/libSM.a))
       
   132 #	    LIBICE = $(firstword $(wildcard /usr/X11R6/lib/libICE.a) \
       
   133 #                             $(wildcard /usr/lib/libICE.a))
       
   134 #	endif
       
   135 #    endif
       
   136 #else
       
   137 #    LIBXM = -L$(MOTIF_LIB) -lXm -lXp
       
   138 #    ifeq ($(PLATFORM), linux)
       
   139 #	LIBXT = -lXt
       
   140 #	LIBSM = 
       
   141 #	LIBICE = 
       
   142 #    endif
       
   143 #endif
       
   144 
       
   145 LIBXTST = -lXtst
   113 LIBXTST = -lXtst
   146 ifeq ($(PLATFORM), linux)
   114 ifeq ($(PLATFORM), linux)
   147    ifeq ($(ARCH_DATA_MODEL), 64)
   115    ifeq ($(ARCH_DATA_MODEL), 64)
   148    # XXX what about the rest of them?
   116    # XXX what about the rest of them?
   149         LIBXT = -lXt
   117         LIBXT = -lXt