make/sun/font/Makefile

rev 8219 : 8024900: PPC64: Enable new build on AIX (jdk part)
8024854: PPC64: Basic changes and files to build the class library on AIX
Reviewed-by: alanb, prr, sla, chegar, michaelm, mullan, art, erikj
Contributed-by: luchsh@linux.vnet.ibm.com, spoole@linux.vnet.ibm.com, thomas.stuefe@sap.com

*** 192,202 ****
  
  #
  # 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.
--- 192,202 ----
  
  #
  # 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.
*** 205,227 ****
  else
  ifeq ($(PLATFORM), solaris)
    # Note that on Solaris, fontmanager is built against the headless library.
    LDFLAGS      += -L$(LIBDIR)/$(LIBARCH)/headless
    OTHER_LDLIBS += -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt -lc $(LIBM) $(LIBCXX)
  else # PLATFORM is linux
   OTHER_LDLIBS  += -lawt $(LIBM) $(LIBCXX)
    ifeq ("$(CC_VER_MAJOR)", "3")
      OTHER_LDLIBS  += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
    endif                           
  endif
  endif
  
  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 \
--- 205,232 ----
  else
  ifeq ($(PLATFORM), solaris)
    # Note that on Solaris, fontmanager is built against the headless library.
    LDFLAGS      += -L$(LIBDIR)/$(LIBARCH)/headless
    OTHER_LDLIBS += -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt -lc $(LIBM) $(LIBCXX)
+ else
+ ifeq ($(PLATFORM), aix)
+   LDFLAGS      += -L$(LIBDIR)/$(LIBARCH)/headless
+   OTHER_LDLIBS += -G -lawt -lc $(LIBM) $(LIBCXX)
  else # PLATFORM is linux
   OTHER_LDLIBS  += -lawt $(LIBM) $(LIBCXX)
    ifeq ("$(CC_VER_MAJOR)", "3")
      OTHER_LDLIBS  += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
    endif                           
  endif
  endif
+ endif
  
  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 \