a517677fe598f9c80c2a1ac650016bddbbac5d3b hiram Sat Mar 30 11:17:15 2013 -0700 eliminate the kludgy flag JKHGAPP from src/hg/ makefiles, can detect that in src/inc/userApp.mk, refs #9104 diff --git src/inc/userApp.mk src/inc/userApp.mk index ff1694d..e4396dc 100644 --- src/inc/userApp.mk +++ src/inc/userApp.mk @@ -2,32 +2,32 @@ # user App rules, typical three-line makefile to use this rule set, # the binary program file name is specified by the 'A' variable: # kentSrc = ../.. # A = aveCols # include $(kentSrc)/inc/userApp.mk # # for more than one object file for the resulting 'A' program, use # extraObjects = second.o third.o fourth.o etc.o # # to use object files built elsewhere: # externObjects = ../path/other.o # include $(kentSrc)/inc/common.mk MYLIBS = $(kentSrc)/lib/$(MACHTYPE)/jkweb.a -ifeq (${JKHGAPLIB},) - MYLIBS = $(kentSrc)/lib/$(MACHTYPE)/jkhgap.a $(kentSrc)/lib/$(MACHTYPE)/jkweb.a $(MYSQLLIBS) +ifeq ($(findstring src/hg/,$(CURDIR)),src/hg/) + MYLIBS = $(kentSrc)/lib/$(MACHTYPE)/jkhgap.a $(kentSrc)/lib/$(MACHTYPE)/jkweb.a $(MYSQLLIBS) -lm endif O = ${A}.o objects = ${O} ${extraObjects} ${externObjects} all ${A}: ${O} ${extraObjects} ${CC} ${COPT} -o ${DESTDIR}${BINDIR}/${A} ${objects} ${MYLIBS} ${L} ${STRIP} ${DESTDIR}${BINDIR}/${A}${EXE} compile: ${O} ${extraObjects} ${MYLIBS} ${CC} ${COPT} ${CFLAGS} -o ${A}${EXE} ${objects} ${MYLIBS} ${L} install:: compile rm -f ${DESTDIR}${BINDIR}/${A}${EXE} cp -p ${A}${EXE} ${DESTDIR}${BINDIR}/${A}${EXE}