make/sun/font/Makefile

*** 170,180 ****
  
  #
  # Libraries to link, and other C flags.
  #
  
! ifeq ($(PLATFORM), macosx))
  OTHER_INCLUDES += -I$(X11_PATH)/include
  OTHER_LDLIBS  += -lawt $(LIBM) $(LIBCXX)
   ifeq ($(OS_VENDOR),Apple)
     # XXXDARWIN Match BSD/Linux behavior -- the mawt.dylib symbols will
     # be available at runtime.
--- 170,180 ----
  
  #
  # Libraries to link, and other C flags.
  #
  
! ifeq ($(PLATFORM), macosx)
  OTHER_INCLUDES += -I$(X11_PATH)/include
  OTHER_LDLIBS  += -lawt $(LIBM) $(LIBCXX)
   ifeq ($(OS_VENDOR),Apple)
     # XXXDARWIN Match BSD/Linux behavior -- the mawt.dylib symbols will
     # be available at runtime.
*** 195,205 ****
  
  endif # PLATFORM
  
  # set up compile flags..
  
! ifeq ($(PLATFORM), macosx))
  CPPFLAGS += -I$(CLASSHDRDIR)
  endif
  
  CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR) \
              -I$(SHARE_SRC)/native/$(PKGDIR)/layout \
--- 195,205 ----
  
  endif # PLATFORM
  
  # set up compile flags..
  
! ifeq ($(PLATFORM), macosx)
  CPPFLAGS += -I$(CLASSHDRDIR)
  endif
  
  CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR) \
              -I$(SHARE_SRC)/native/$(PKGDIR)/layout \