src/hg/visiGene/vgPrepImage/makefile 1.6

1.6 2010/01/28 00:24:47 galt
trying to get it to compile, using dynamic libjpeg since static no longer easily available, changing jpeg2000 dependency to default off since most people will not need it, using jpgTilesX.h as a minimal include file removes the conflict over "boolean" between common.h and libjpeg.h
Index: src/hg/visiGene/vgPrepImage/makefile
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/visiGene/vgPrepImage/makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -B -U 1000000 -r1.5 -r1.6
--- src/hg/visiGene/vgPrepImage/makefile	10 Mar 2009 00:34:40 -0000	1.5
+++ src/hg/visiGene/vgPrepImage/makefile	28 Jan 2010 00:24:47 -0000	1.6
@@ -1,35 +1,40 @@
 
 include ../../../inc/common.mk
 
-ERMAPPER = /scratch/galt/ecw-jpeg/libecwj2-3.3
-XINC = -I${ERMAPPER}/Source/NCSBuildQmake -I${ERMAPPER}/Source/include -I/usr/include -I.
-ERLIBS  = -lpthread ${ERMAPPER}/lib/libecwj2.a /usr/lib64/libjpeg.a
+ifeq (${USE_JPG2000},1)
+    ERMAPPER = /scratch/galt/ecw-jpeg/libecwj2-3.3
+    XINC = -I${ERMAPPER}/Source/NCSBuildQmake -I${ERMAPPER}/Source/include -I/usr/include -I.
+    ERLIBS  = -lpthread ${ERMAPPER}/lib/libecwj2.a
+else
+    XINC = -I/usr/include -I.
+    ERLIBS  = -lpthread
+endif
 
 CFLAGS = -pipe -Wall -W -O2 -DLINUX -DUNICODE -D_REENTRANT -DPOSIX
 
-L += -lm
+L += -lm -ljpeg
 MYLIBDIR = ../../../lib/${MACHTYPE}
 MYLIBS =  ${MYLIBDIR}/jkweb.a ${ERLIBS}
 
 # required for some .cpp elements in libecwj2.a
 LINK=g++
 
 A = vgPrepImage
 
 O = ${A}.o jp2Dec.o jpgDec.o jpgTiles.o
 
 ${A}: $O ${MYLIBS}
 	${LINK} ${COPT} -o ${BINDIR}/${A} $O ${MYLIBS} $L
 	strip ${BINDIR}/${A}
 
 install:
 	cp ${BINDIR}/${A} /cluster/bin/${MACHTYPE}/
 
 example:
 	vgPrepImage /san/sanvol1/visiGene/offline/allenBrain/imageDisk \
 	/san/sanvol1/visiGene/gbdb/full/inSitu/Mouse/allenBrain \
 	/san/sanvol1/visiGene/gbdb/full/inSitu/Mouse/allenBrain \
 	prod3/LOC432413_124_0205042191_D.jp2
 
 clean:
 	rm -f $O