src/inc/common.mk 1.78

1.78 2010/03/31 17:04:30 angie
Removed redundant 'ifeq(${VAR},) VAR=0' -- if that evals true then the subsequent 'ifeq(${VAR},1)' would fail anyway. Did a little indenting/nesting of related var checks.

Index: src/inc/common.mk
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/inc/common.mk,v
retrieving revision 1.77
retrieving revision 1.78
diff -b -B -U 4 -r1.77 -r1.78
--- src/inc/common.mk	9 Mar 2010 06:01:18 -0000	1.77
+++ src/inc/common.mk	31 Mar 2010 17:04:30 -0000	1.78
@@ -10,33 +10,24 @@
 #global external libraries 
 L=
 
 # libssl: disabled by default
-ifeq (${USE_SSL},)
-    USE_SSL=0
-endif
 ifeq (${USE_SSL},1)
     L+=-lssl
     HG_DEFS+=-DUSE_SSL
 endif
 
 # libpng: disabled by default
-ifeq (${USE_PNG},)
-    USE_PNG=0
-endif
 ifeq (${USE_PNG},1)
-ifeq (${PNGLIB},)
+    ifeq (${PNGLIB},)
     PNGLIB=-lpng
-endif
+    endif
     L+=${PNGLIB}
     HG_DEFS+=-DUSE_PNG
     HG_INC+=${PNGINCL}
 endif
 
 # libbam (samtools, and Angie's KNETFILE_HOOKS extension to it): disabled by default
-ifeq (${USE_BAM},)
-    USE_BAM=0
-endif
 ifeq (${USE_BAM},1)
     ifeq (${SAMDIR},)
       SAMDIR = /hive/data/outside/samtools/svn_${MACHTYPE}/samtools
     endif
@@ -48,11 +39,11 @@
     endif
     HG_INC += -I${SAMINC}
     L+=${SAMLIB}
     HG_DEFS+=-DUSE_BAM
-endif
-ifeq (${KNETFILE_HOOKS},1)
+    ifeq (${KNETFILE_HOOKS},1)
     HG_DEFS+=-DKNETFILE_HOOKS
+    endif
 endif
 
 ifeq (${HG_WARN},)
   ifeq (darwin,$(findstring darwin,${OSTYPE}))