4d1132fe8af3037e9bc3f4ff419151cebcc10fc1 markd Sun Jan 19 11:28:49 2025 -0800 userApps working as before on hgwdev diff --git src/inc/userApp.mk src/inc/userApp.mk index 3a66beaa8af..c3902521d1f 100644 --- src/inc/userApp.mk +++ src/inc/userApp.mk @@ -23,31 +23,33 @@ # 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 = ${STATIC_PRE} ${DEPLIBS} ${MYSQLLIBS} objects = ${extraObjects} ${externObjects} default:: ${A:%=${DESTDIR}${BINDIR}/%${EXE}} -${DESTDIR}${BINDIR}/%${EXE}: ${DEPLIBS} %.o ${objects} +${extraObjects}: ${extraHeaders} + +${DESTDIR}${BINDIR}/%${EXE}: %.o ${objects} ${DEPLIBS} @mkdir -p $(dir $@) ${CC} ${COPT} -o $@ $*.o ${objects} ${LINKLIBS} ${L} ${STRIP} ${DESTDIR}${BINDIR}/${A}${EXE} compile:: ${A:%=%${EXE}} %${EXE}: ${DEPLIBS} %.o ${objects} ${CC} ${COPT} -o $@ $*.o ${objects} ${LINKLIBS} ${L} install:: ${A:%=${DESTDIR}${BINDIR}/%${EXE}} clean:: rm -f ${O} ${extraObjects} ${A:%=%${EXE}} @if test -d tests -a -s tests/makefile; then cd tests && ${MAKE} clean; fi