diff options
author | ru <ru@FreeBSD.org> | 2001-03-21 10:56:29 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2001-03-21 10:56:29 +0000 |
commit | c2deb094a860c4b2c18a7f820b2e357d6e2e93f8 (patch) | |
tree | 74f8018f190823d8f74016239f81a51fff4f523c /usr.sbin | |
parent | dc0e22cfaf1b407ad08776ab7386543ad024a76c (diff) | |
download | FreeBSD-src-c2deb094a860c4b2c18a7f820b2e357d6e2e93f8.zip FreeBSD-src-c2deb094a860c4b2c18a7f820b2e357d6e2e93f8.tar.gz |
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
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/amd/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/amd/Makefile.inc | 33 | ||||
-rw-r--r-- | usr.sbin/amd/fixmount/Makefile | 3 | ||||
-rw-r--r-- | usr.sbin/amd/include/Makefile | 13 | ||||
-rw-r--r-- | usr.sbin/amd/mk-amd-map/Makefile | 1 | ||||
-rw-r--r-- | usr.sbin/amd/wire-test/Makefile | 1 |
6 files changed, 21 insertions, 32 deletions
diff --git a/usr.sbin/amd/Makefile b/usr.sbin/amd/Makefile index f970945..0bf72fd 100644 --- a/usr.sbin/amd/Makefile +++ b/usr.sbin/amd/Makefile @@ -6,6 +6,6 @@ # $FreeBSD$ # -SUBDIR= libamu amd amq doc fixmount fsinfo hlfsd mk-amd-map pawd scripts wire-test +SUBDIR= include libamu amd amq doc fixmount fsinfo hlfsd mk-amd-map pawd scripts wire-test .include <bsd.subdir.mk> 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" diff --git a/usr.sbin/amd/fixmount/Makefile b/usr.sbin/amd/fixmount/Makefile index 9e7017d..4ba5a6f 100644 --- a/usr.sbin/amd/fixmount/Makefile +++ b/usr.sbin/amd/fixmount/Makefile @@ -13,9 +13,6 @@ PROG= fixmount SRCS= fixmount.c -# These are generated at compile time -SRCS+= mount.h nfs_prot.h - # These would be links created by the GNU-style configure SRCS+= checkmount_bsd44.c diff --git a/usr.sbin/amd/include/Makefile b/usr.sbin/amd/include/Makefile index 0bf2c8e..f8e141f 100644 --- a/usr.sbin/amd/include/Makefile +++ b/usr.sbin/amd/include/Makefile @@ -8,6 +8,17 @@ # $NetBSD: Makefile,v 1.8 1998/08/08 22:33:37 christos Exp $ # -all: config_local.h +SRCS= config_local.h mount.h nfs_prot.h +CLEANFILES= ${SRCS} + +config_local.h: newvers.sh + @rm -f ${.TARGET} + sh ${.ALLSRC} > ${.TARGET} + +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} .include <bsd.prog.mk> diff --git a/usr.sbin/amd/mk-amd-map/Makefile b/usr.sbin/amd/mk-amd-map/Makefile index 2d1e3ec..c50e297 100644 --- a/usr.sbin/amd/mk-amd-map/Makefile +++ b/usr.sbin/amd/mk-amd-map/Makefile @@ -9,6 +9,5 @@ .PATH: ${.CURDIR}/../../../contrib/amd/mk-amd-map PROG= mk-amd-map -SRCS= mk-amd-map.c .include <bsd.prog.mk> diff --git a/usr.sbin/amd/wire-test/Makefile b/usr.sbin/amd/wire-test/Makefile index 47eb2df..b9d064b 100644 --- a/usr.sbin/amd/wire-test/Makefile +++ b/usr.sbin/amd/wire-test/Makefile @@ -9,7 +9,6 @@ .PATH: ${.CURDIR}/../../../contrib/amd/wire-test PROG= wire-test -SRCS= wire-test.c DPADD+= ${LIBAMU} LDADD+= ${LIBAMU} |