Complete the hookup of ahd/ahc module building.

3 files changed, 41 insertions, 15 deletions

diff --git a/sys/modules/aic7xxx/ahc/Makefile b/sys/modules/aic7xxx/ahc/Makefile
index 2511ec8..41e667b3 100644
--- a/sys/modules/aic7xxx/ahc/Makefile
+++ b/sys/modules/aic7xxx/ahc/Makefile
@@ -10,19 +10,28 @@ BEFORE_DEPEND= aic7xxx_{seq,reg}.h
 ../aicasm/aicasm:
 	( cd ${.CURDIR}/../aicasm; ${MAKE} aicasm; )
 
-aic7xxx_{seq,reg}.h: ${.CURDIR}/../../../dev/aic7xxx/aic7xxx.{reg,seq} \
-		   ${.CURDIR}/../../../cam/scsi/scsi_message.h ../aicasm/aicasm
-	${.CURDIR}/../aicasm/aicasm ${INCLUDES} -I${.CURDIR}/../../../cam/scsi \
-	-I${.CURDIR}/../../../dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h \
-	${.CURDIR}/../../../dev/aic7xxx/aic7xxx.seq
+aic7xxx_{seq.h,reg.h,reg_print.c}:					\
+		${.CURDIR}/../../../dev/aic7xxx/aic7xxx.{reg,seq}	\
+		${.CURDIR}/../../../cam/scsi/scsi_message.h ../aicasm/aicasm
+	${.OBJDIR}/../aicasm/aicasm ${INCLUDES} -I${.CURDIR}/../../../cam/scsi \
+			-I${.CURDIR}/../../../dev/aic7xxx		 \
+			-o aic7xxx_seq.h -r aic7xxx_reg.h		 \
+			-p aic7xxx_reg_print.c				 \
+			-i ${.CURDIR}/../../../dev/aic7xxx/aic7xxx_osm.h \
+			${.CURDIR}/../../../dev/aic7xxx/aic7xxx.seq
 
 GENSRCS= aic7xxx_reg.h aic7xxx_seq.h
 
+AHC_REG_PRETTY_PRINT=1
 SRCS= ${GENSRCS}
+.ifdef AHC_REG_PRETTY_PRINT
+SRCS+= aic7xxx_reg_print.c
+CFLAGS+= -DAHC_REG_PRETTY_PRINT=1
+.endif
 SRCS+= aic7xxx.c aic7xxx_93cx6.c aic7xxx_osm.c
 SRCS+= opt_scsi.h opt_aic7xxx.h opt_cam.h
 SRCS+= device_if.h bus_if.h pci_if.h
 
-CLEANFILES= ${GENSRCS}
+CLEANFILES= ${GENSRCS} aic7xxx_reg_print.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/aic7xxx/ahd/Makefile b/sys/modules/aic7xxx/ahd/Makefile
index b9d5364..338abfd 100644
--- a/sys/modules/aic7xxx/ahd/Makefile
+++ b/sys/modules/aic7xxx/ahd/Makefile
@@ -9,19 +9,28 @@ BEFORE_DEPEND= aic79xx_{seq,reg}.h
 ../aicasm/aicasm:
 	( cd ${.CURDIR}/../aicasm; ${MAKE} aicasm; )
 
-aic79xx_{seq,reg}.h: ${.CURDIR}/../../../dev/aic7xxx/aic79xx.{reg,seq} \
-		   ${.CURDIR}/../../../cam/scsi/scsi_message.h ../aicasm/aicasm
-	${.CURDIR}/../aicasm/aicasm ${INCLUDES} -I${.CURDIR}/../../../cam/scsi \
-	-I${.CURDIR}/../../../dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h \
-	${.CURDIR}/../../../dev/aic7xxx/aic79xx.seq
+aic79xx_{seq.h,reg.h,reg_print.c}:					\
+		${.CURDIR}/../../../dev/aic7xxx/aic79xx.{reg,seq}	\
+		${.CURDIR}/../../../cam/scsi/scsi_message.h ../aicasm/aicasm
+	${.OBJDIR}/../aicasm/aicasm ${INCLUDES} -I${.CURDIR}/../../../cam/scsi \
+			-I${.CURDIR}/../../../dev/aic7xxx		 \
+			-o aic79xx_seq.h -r aic79xx_reg.h		 \
+			-p aic79xx_reg_print.c				 \
+			-i ${.CURDIR}/../../../dev/aic7xxx/aic79xx_osm.h \
+			${.CURDIR}/../../../dev/aic7xxx/aic79xx.seq
 
 GENSRCS= aic79xx_reg.h aic79xx_seq.h
 
 SRCS= ${GENSRCS}
+AHD_REG_PRETTY_PRINT=1
+.ifdef AHD_REG_PRETTY_PRINT
+SRCS+= aic79xx_reg_print.c
+CFLAGS+= -DAHD_REG_PRETTY_PRINT=1
+.endif
 SRCS+= aic79xx.c aic79xx_osm.c aic79xx_pci.c ahd_pci.c
 SRCS+= opt_scsi.h opt_aic79xx.h opt_cam.h opt_ddb.h
 SRCS+= device_if.h bus_if.h pci_if.h
 
-CLEANFILES= ${GENSRCS}
+CLEANFILES= ${GENSRCS} aic79xx_reg_print.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/aic7xxx/aicasm/Makefile b/sys/modules/aic7xxx/aicasm/Makefile
index 1606d39..890ace7 100644
--- a/sys/modules/aic7xxx/aicasm/Makefile
+++ b/sys/modules/aic7xxx/aicasm/Makefile
@@ -7,8 +7,16 @@ aicasm:	${.CURDIR}/../../../dev/aic7xxx/aicasm/*.[chyl]
 	${MAKE} -f ${.CURDIR}/../../../dev/aic7xxx/aicasm/Makefile \
 	MAKESRCPATH=${.CURDIR}/../../../dev/aic7xxx/aicasm
 
-install:
+depend:
+	${MAKE} -f ${.CURDIR}/../../../dev/aic7xxx/aicasm/Makefile \
+	MAKESRCPATH=${.CURDIR}/../../../dev/aic7xxx/aicasm depend
+
+obj:
+	${MAKE} -f ${.CURDIR}/../../../dev/aic7xxx/aicasm/Makefile \
+	MAKESRCPATH=${.CURDIR}/../../../dev/aic7xxx/aicasm obj
 
 clean:
-	rm -f *.[chylo]
-	rm -f aicasm
+	${MAKE} -f ${.CURDIR}/../../../dev/aic7xxx/aicasm/Makefile \
+	MAKESRCPATH=${.CURDIR}/../../../dev/aic7xxx/aicasm clean
+
+install: