src/inc/common.mk 1.73

1.73 2009/10/30 21:58:42 markd
allow overriding the location of libpng
Index: src/inc/common.mk
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/inc/common.mk,v
retrieving revision 1.72
retrieving revision 1.73
diff -b -B -U 4 -r1.72 -r1.73
--- src/inc/common.mk	15 Oct 2009 19:26:36 -0000	1.72
+++ src/inc/common.mk	30 Oct 2009 21:58:42 -0000	1.73
@@ -4,8 +4,9 @@
     COPT=-O -g
 endif
 CFLAGS=
 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
 
 #global external libraries 
 L=
 
@@ -22,14 +23,16 @@
 ifeq (${USE_PNG},)
     USE_PNG=0
 endif
 ifeq (${USE_PNG},1)
-    L+=-lpng
+ifeq (${PNGLIB},)
+    PNGLIB=-lpng
+endif
+    L+=${PNGLIB}
     HG_DEFS+=-DUSE_PNG
+    HG_INC+=${PNGINCL}
 endif
 
-HG_INC=-I../inc -I../../inc -I../../../inc -I../../../../inc -I../../../../../inc
-
 # libbam: disabled by default
 ifeq (${USE_BAM},)
     USE_BAM=0
 endif