9305e89905370505717c216cea3eaa778efbc983 hiram Fri Mar 29 14:57:00 2013 -0700 adding src/hg/utils link support with jkhgap and mysql libs libraries on conditional refs #9104 diff --git src/inc/userApp.mk src/inc/userApp.mk index ba77919..ff1694d 100644 --- src/inc/userApp.mk +++ src/inc/userApp.mk @@ -3,31 +3,31 @@ # 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 $(MYSQLLIBS) + MYLIBS = $(kentSrc)/lib/$(MACHTYPE)/jkhgap.a $(kentSrc)/lib/$(MACHTYPE)/jkweb.a $(MYSQLLIBS) 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}