d4926daf233227dc632c2af1fd93bfbebed1eebf jcasper Fri Feb 21 12:21:16 2025 -0800 userApps need extraHeaders targets to be satisfied _before_ building the primary object, refs #35269 diff --git src/inc/userApp.mk src/inc/userApp.mk index 14d5d37e813..c9229a92456 100644 --- src/inc/userApp.mk +++ src/inc/userApp.mk @@ -38,31 +38,31 @@ 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} default:: ${DESTBINDIR}/${A}${EXE} compile:: ${A} -objects = ${A}.o ${extraObjects} ${externObjects} +objects = ${extraObjects} ${A}.o ${externObjects} ${extraObjects}: ${extraHeaders} ${DESTBINDIR}/${A}${EXE}: ${objects} ${DEPLIBS} @${MKDIR} $(dir $@) ${CC} ${COPT} -o $@ ${objects} ${LINKLIBS} ${L} ${STRIP} $@ ifeq (${SEMI_STATIC},yes) ${userAppsCheckLinking} $@ endif ${A}${EXE}: ${objects} ${DEPLIBS} ${CC} ${COPT} -o $@ ${objects} ${LINKLIBS} ${L} install:: ${A:%=${DESTBINDIR}/%${EXE}}