b1b4bdec2ae76dfc7798ab4d5ea905a2572aa2a5 hiram Tue Jun 4 14:17:37 2013 -0700 updating userApps to make the fetchSource a separate step refs #9149 diff --git src/inc/userApp.mk src/inc/userApp.mk index d62e762..4450f6c 100644 --- src/inc/userApp.mk +++ src/inc/userApp.mk @@ -2,30 +2,31 @@ # 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 # # use other libraries BEFORE jkweb.a # preMyLibs += path/to/lib/other.a # +include ${kentSrc}/inc/localEnvironment.mk include ${kentSrc}/inc/common.mk DEPLIBS = ${preMyLibs} ${kentSrc}/lib/${MACHTYPE}/jkweb.a ifeq ($(findstring src/hg/,${CURDIR}),src/hg/) DEPLIBS = ${preMyLibs} ${kentSrc}/lib/${MACHTYPE}/jkhgap.a ${kentSrc}/lib/${MACHTYPE}/jkweb.a endif LINKLIBS = ${DEPLIBS} ${MYSQLLIBS} -lm O = ${A}.o objects = ${O} ${extraObjects} ${externObjects} ${DESTDIR}${BINDIR}/${A}${EXE}: ${DEPLIBS} ${O} ${extraObjects} ${CC} ${COPT} -o ${DESTDIR}${BINDIR}/${A}${EXE} ${objects} ${LINKLIBS} ${L} -lm ${STRIP} ${DESTDIR}${BINDIR}/${A}${EXE}