4c0c9b11b17727025a36a497f8ca22e559211c3c
braney
  Thu Sep 10 14:21:30 2020 -0700
clean up inclusion of freetype library.

diff --git src/inc/common.mk src/inc/common.mk
index 33a2a6f..c16be79 100644
--- src/inc/common.mk
+++ src/inc/common.mk
@@ -15,31 +15,31 @@
 #    $(info MACHTYPE has - sign ${MACHTYPE})
     MACHTYPE:=$(shell uname -m)
 #    $(info MACHTYPE has - sign set to: ${MACHTYPE})
 endif
 
 HG_DEFS=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -DMACHTYPE_${MACHTYPE}
 HG_INC+=-I../inc -I../../inc -I../../../inc -I../../../../inc -I../../../../../inc -I$(kentSrc)/htslib
 
 # to check for Mac OSX Darwin specifics:
 UNAME_S := $(shell uname -s)
 # to check for builds on hgwdev
 HOSTNAME = $(shell uname -n)
 
 ifeq (${HOSTNAME},hgwdev)
   IS_HGWDEV = yes
-  HG_INC+=-I/usr/include/freetype2
+  HG_INC+=-I/usr/include/freetype2 -DUSE_FREETYPE
 else
   IS_HGWDEV = no
 endif
 
 ifeq (${IS_HGWDEV},yes)
   FULLWARN = yes
 endif
 
 ifeq (${HOSTNAME},cirm-01)
   FULLWARN = yes
 endif
 
 ifeq (${PTHREADLIB},)
   PTHREADLIB=-lpthread
 endif
@@ -90,31 +90,32 @@
 ifeq (${USE_HIC},1)
     HG_DEFS+=-DUSE_HIC
 endif
 
 # libssl: disabled by default
 ifneq (${SSL_DIR}, "/usr/include/openssl")
   ifneq ($(UNAME_S),Darwin)
     ifneq ($(wildcard ${SSL_DIR}),)
       L+=-L${SSL_DIR}/lib
     endif
   endif
     HG_INC+=-I${SSL_DIR}/include
 endif
 # on hgwdev, already using the static library with mysqllient.
 ifeq (${IS_HGWDEV},yes)
-   L+=/usr/lib64/libssl.a /usr/lib64/libcrypto.a -lkrb5 -lk5crypto -ldl -lfreetype
+   L+=/hive/groups/browser/freetype/freetype-2.10.0/objs/.libs/libfreetype.a -lbz2
+   L+=/usr/lib64/libssl.a /usr/lib64/libcrypto.a -lkrb5 -lk5crypto -ldl
 else
    ifneq ($(wildcard /opt/local/lib/libssl.a),)
        L+=/opt/local/lib/libssl.a
    else
      ifneq ($(wildcard /usr/lib/x86_64-linux-gnu/libssl.a),)
 	L+=/usr/lib/x86_64-linux-gnu/libssl.a
      else
         ifneq ($(wildcard /usr/local/opt/openssl/lib/libssl.a),)
            L+=/usr/local/opt/openssl/lib/libssl.a
         else
            L+=-lssl
         endif
      endif
    endif
    ifneq ($(wildcard /opt/local/lib/libcrypto.a),)