Properly fix the world breakage.

Unpollute the Makefile.inc's abuse of SRCS variable, and move
the generation of header files into include/ subdirecory.

Reviewed by:	buildworld

1 files changed, 8 insertions, 25 deletions

diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc
index 629ce42..55290c8 100644
--- a/usr.sbin/amd/Makefile.inc
+++ b/usr.sbin/amd/Makefile.inc
@@ -10,43 +10,26 @@
 #	$NetBSD: Makefile,v 1.8 1998/08/08 22:33:37 christos Exp $
 #
 
-#INCGEN!=	cd ${.CURDIR}/../include; \
-#		printf 'xwhere: .MAKE\n\t@echo \$${.OBJDIR}\n' | ${MAKE} -Bs -f-
-
-#CFLAGS+=	-I${INCGEN}
 CFLAGS+=	-I. -I${.CURDIR} 
 CFLAGS+=	-I${.CURDIR}/../include
+.if exists(${.OBJDIR}/../include)
+CFLAGS+=	-I${.OBJDIR}/../include
+.endif
 CFLAGS+=	-I${.CURDIR}/../../../contrib/amd/include
 CFLAGS+=	-I${.CURDIR}/../../../contrib/amd
 CFLAGS+=	-DHAVE_CONFIG_H
 
-LIBAMUDIR!=	cd ${.CURDIR}/../libamu; \
-		printf 'xwhere: .MAKE\n\t@echo \$${.OBJDIR}\n' | ${MAKE} -Bs -f-
+.if exists(${.OBJDIR}/../libamu)
+LIBAMUDIR=	${.OBJDIR}/../libamu
+.else
+LIBAMUDIR=	${.CURDIR}/../libamu
+.endif
 LIBAMU=		${LIBAMUDIR}/libamu.a
 
-.if !defined(INFO)
-
-SRCS+=		config_local.h
-CLEANFILES+=	config_local.h
-config_local.h: ${.CURDIR}/../include/newvers.sh
-	@rm -f ${.TARGET}
-	sh ${.ALLSRC} > ${.TARGET}
-
-
 RPCCOM=		rpcgen
 MOUNT_X=	${DESTDIR}/usr/include/rpcsvc/mount.x
 NFS_PROT_X=	${DESTDIR}/usr/include/rpcsvc/nfs_prot.x
-#		These are generated at compile time
-SRCS+=		mount.h nfs_prot.h
-CLEANFILES+=	mount.h nfs_prot.h
-
-mount.h: ${MOUNT_X}
-	${RPCCOM} -h -C -DWANT_NFS3 ${MOUNT_X} -o ${.TARGET}
 
-nfs_prot.h: ${NFS_PROT_X}
-	${RPCCOM} -h -C -DWANT_NFS3 ${NFS_PROT_X} -o ${.TARGET}
-
-.endif
 
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"