--- old/make/sun/font/t2k/Makefile
          +++ new/make/sun/font/t2k/Makefile

   1    1  #
   2    2  # Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
   3    3  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   4    4  #
   5    5  # This code is free software; you can redistribute it and/or modify it
   6    6  # under the terms of the GNU General Public License version 2 only, as
   7    7  # published by the Free Software Foundation.  Oracle designates this
   8    8  # particular file as subject to the "Classpath" exception as provided
   9    9  # by Oracle in the LICENSE file that accompanied this code.
  10   10  #
  11   11  # This code is distributed in the hope that it will be useful, but WITHOUT
  12   12  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  13   13  # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  14   14  # version 2 for more details (a copy is included in the LICENSE file that
  15   15  # accompanied this code).
  16   16  #
  17   17  # You should have received a copy of the GNU General Public License version
  18   18  # 2 along with this work; if not, write to the Free Software Foundation,
  19   19  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  20   20  #
  21   21  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  22   22  # or visit www.oracle.com if you need additional information or have any
  23   23  # questions.
  24   24  #
  25   25  
  26   26  #
  27   27  # Makefile for building t2k rasteriser.
  28   28  #
  29   29  
  30   30  BUILDDIR = ../../..
  31   31  PACKAGE = sun.font
  32   32  LIBRARY = t2k
  33   33  PRODUCT = sun
  34   34  
  35   35  # Indicate we want the C++ compiler to do the linking.
  36   36  CPLUSPLUSLIBRARY=true
  37   37  
  38   38  # Part of the sun.font package, but doesn't rebuild classes (except
  39   39  # for a few ones with native methods) so shouldn't clobber them.
  40   40  DONT_CLOBBER_CLASSES=true
  41   41  
  42   42  # Use higher optimization level
  43   43  OPTIMIZATION_LEVEL = HIGHER
  44   44  
  45   45  include $(BUILDDIR)/common/Defs.gmk
  46   46  
  47   47  #
  48   48  # Files
  49   49  #
  50   50  include FILES_c.gmk
  51   51  
  52   52  FILES_export = \
  53   53      java/awt/Font.java \
  54   54      sun/font/FileFont.java \
  55   55      sun/font/FontManager.java \
  56   56      sun/font/GlyphList.java \
  57   57      sun/font/NativeFont.java \
  58   58      sun/font/StrikeCache.java \
  59   59      sun/font/T2KFontScaler.java 
  60   60  
  61   61  ifeq ($(PLATFORM), windows)
  62   62  
  63   63    # t2k imports several shared methods from fontmanager.dll
  64   64    LDLIBS += user32.lib $(OBJDIR)/../../../sun.font/fontmanager/$(OBJDIRNAME)/fontmanager.lib
  65   65  
  66   66    OTHER_CFLAGS += -DCC_NOEX
  67   67    OTHER_CXXFLAGS += -DCC_NOEX
  68   68  
  69   69  endif # PLATFORM
  70   70  
  71   71  #
  72   72  # In the OpenJDK mode we are not building anything
  73   73  #
  74   74  ifndef OPENJDK
  75   75  include $(BUILDDIR)/common/Mapfile-vers.gmk
  76   76  include $(BUILDDIR)/common/Library.gmk
  77   77  endif 
  78   78  
  79   79  #
  80   80  # Add to the ambient vpath to pick up files in subdirectories
  81   81  #
  82   82  vpath %.c   $(SHARE_SRC)/share/native/$(PKGDIR)
  83   83  vpath %.c   $(PLATFORM_SRC)/native/$(PKGDIR)
  84   84  vpath %.c   $(CLOSED_SRC)/share/native/$(PKGDIR)
  85   85  vpath %.c   $(CLOSED_SRC)/share/native/$(PKGDIR)/t2k
  86   86  vpath %.c   $(CLOSED_SRC)/share/native/$(PKGDIR)/t2k/ttHints
  87   87  
  88   88  vpath %.cpp   $(SHARE_SRC)/native/$(PKGDIR)
  89   89  vpath %.cpp   $(CLOSED_SRC)/share/native/$(PKGDIR)
  90   90  
  91   91  # Libraries to link, and other C flags.

  92   92  #
  93   93  # setup the list of libraries to link in...
  94   94  ifneq ($(PLATFORM), windows)
  95   95    OTHER_LDLIBS  +=  $(LIBM) $(LIBCXX) -lfontmanager
  96   96    ifeq ($(PLATFORM), linux)
  97   97      ifeq ("$(CC_VER_MAJOR)", "3")
  98   98        OTHER_LDLIBS  += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
  99   99      endif                           
 100  100    else
 101  101      ifeq ($(PLATFORM), solaris)
 102      -      OTHER_LDLIBS += -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
      102 +      OTHER_LDLIBS += -lawt -lawt_xawt
 103  103      endif
 104  104    endif
 105  105  endif
 106  106  
 107  107  
 108  108  # set up compile flags..
 109  109  
 110  110  CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR) \
 111  111              -I$(CLOSED_SRC)/share/native/$(PKGDIR)/t2k \
 112  112              -I$(CLOSED_SRC)/share/native/$(PKGDIR) \
 113  113              -I$(SHARE_SRC)/share/native/$(PKGDIR) \
 114  114              -I$(PLATFORM_SRC)/native/$(PKGDIR) \
 115  115              -I$(SHARE_SRC)/native/sun/java2d/loops \
 116  116              -I$(SHARE_SRC)/native/sun/java2d/pipe \
 117  117              -I$(PLATFORM_SRC)/native/sun/java2d \
 118  118              -I$(SHARE_SRC)/native/sun/java2d \
 119  119              -I$(TEMPDIR)/../fontmanager/CClassHeaders
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX