# HG changeset patch # Parent b5f2565d1d632caddc95fcd7b05475c98ab98569 Be explicit about where we grab include files from, to avoid ambiguity in upgrade cases. Also, don't provide the fallback targets to build the firmware. They confuse fmake. Only define them when .MAKE.LEVEL is defined so bootstrapping and other building from older versions works better. diff -r b5f2565d1d63 sys/modules/aic7xxx/ahc/Makefile --- a/sys/modules/aic7xxx/ahc/Makefile +++ b/sys/modules/aic7xxx/ahc/Makefile @@ -19,6 +19,7 @@ GENSRCS+= aic7xxx_reg_print.c CFLAGS+= -DAHC_REG_PRETTY_PRINT=1 REG_PRINT_OPT= -p aic7xxx_reg_print.c .endif +CFLAGS += -I${.CURDIR}/../../../dev/aic7xxx BEFORE_DEPEND = ${GENSRCS} ../aicasm/aicasm: ${.CURDIR}/../../../dev/aic7xxx/aicasm/*.[chyl] @@ -35,7 +36,10 @@ ahcfirmware: ${GENSRCS} ${REG_PRINT_OPT} \ -i ${.CURDIR}/../../../dev/aic7xxx/aic7xxx_osm.h \ ${.CURDIR}/../../../dev/aic7xxx/aic7xxx.seq -.else +.elif defined(.MAKE.LEVEL) +# This target interfers with fmake's world view and causes this message +# to appear when building the tree from 8.x worlds where fmake is the +# default. fmake doens't define .MAKE.LEVEL so key off that to omit it. ${GENSRCS}: @echo "Error: ${.TARGET} is missing. Run 'make ahcfirmware'" .endif