a3dc6f427dd906f15647f68eda2fb4b75ece6ffd markd Mon Feb 10 15:22:59 2025 -0800 fixed a broken makefile and so other improvements from code review diff --git src/inc/userApp.mk src/inc/userApp.mk index cff3683917a..f0dd531e6e3 100644 --- src/inc/userApp.mk +++ src/inc/userApp.mk @@ -24,43 +24,43 @@ include ${kentSrc}/inc/localEnvironment.mk include ${kentSrc}/inc/common.mk # with SEMI_STATIC, this makes sure only allow shared lirbaries are used userAppsCheckLinking=${kentSrc}/utils/qa/weeklybld/userAppsCheckLinking 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}} +default:: ${A:%=${DESTBINDIR}/%${EXE}} ${extraObjects}: ${extraHeaders} -${DESTDIR}${BINDIR}/%${EXE}: %.o ${objects} ${DEPLIBS} - @mkdir -p $(dir $@) +${DESTBINDIR}/%${EXE}: %.o ${objects} ${DEPLIBS} + @${MKDIR} $(dir $@) ${CC} ${COPT} -o $@ $*.o ${objects} ${LINKLIBS} ${L} ${STRIP} ${DESTDIR}${BINDIR}/${A}${EXE} ifeq (${SEMI_STATIC},yes) ${userAppsCheckLinking} $@ endif compile:: ${A:%=%${EXE}} %${EXE}: ${DEPLIBS} %.o ${objects} ${CC} ${COPT} -o $@ $*.o ${objects} ${LINKLIBS} ${L} -install:: ${A:%=${DESTDIR}${BINDIR}/%${EXE}} +install:: ${A:%=${DESTBINDIR}/%${EXE}} clean:: rm -f ${O} ${extraObjects} ${A:%=%${EXE}} @if test -d tests -a -s tests/makefile; then cd tests && ${MAKE} clean; fi test:: @if test -d tests -a -s tests/makefile; then (cd tests && ${MAKE} test); \ else echo "# no tests directory (or perhaps no tests/makefile) in $(CURDIR)"; fi ${extraObjects}: ${extraHeaders}