Print this page


Split Close
Expand all
Collapse all
          --- old/make/sun/jawt/Makefile
          +++ new/make/sun/jawt/Makefile
↓ open down ↓ 105 lines elided ↑ open up ↑
 106  106              -I$(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/x11 \
 107  107              -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/doe \
 108  108              -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/path \
 109  109              -I$(PLATFORM_SRC)/native/$(PKGDIR)/../jdga \
 110  110              $(EVENT_MODEL)
 111  111  #
 112  112  # Libraries to link in.
 113  113  #
 114  114  ifeq ($(PLATFORM), solaris)
 115  115    ifndef BUILD_HEADLESS_ONLY
 116      -    OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt -L/usr/openwin/sfw/lib$(ISA_DIR) -lXrender
      116 +    OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -lawt_xawt -L/usr/openwin/sfw/lib$(ISA_DIR) -lXrender
 117  117    else
 118      -    OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -L$(LIBDIR)/$(LIBARCH)/headless -lmawt -L/usr/openwin/sfw/lib$(ISA_DIR) -lXrender
      118 +    OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -lawt_headless -L/usr/openwin/sfw/lib$(ISA_DIR) -lXrender
 119  119    endif
 120  120  endif # PLATFORM
 121  121  
 122  122  ifeq ($(PLATFORM), linux)
 123  123    ifndef BUILD_HEADLESS_ONLY
 124      -    OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
      124 +    OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -lawt_xawt
 125  125    else
 126      -    OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/headless -lmawt
      126 +    OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -lawt_headless
 127  127      CFLAGS += -DHEADLESS
 128  128    endif
 129  129  endif # PLATFORM
 130  130  
 131  131  endif # PLATFORM
 132  132  
 133  133  
 134  134  #
 135  135  # Lets not remove any class files.
 136  136  #
↓ open down ↓ 28 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX