jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-27 13:32:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Properly fix the world breakage.

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

Reviewed by:	buildworld
This commit is contained in:
Ruslan Ermilov 2001-03-21 10:56:29 +00:00
parent 7578c6ab98
commit 742f5bdd4c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=74558
6 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/amd/Makefile
View File

@ -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>

33
usr.sbin/amd/Makefile.inc
View File

@ -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"

3
usr.sbin/amd/fixmount/Makefile
View File

@ -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

13
usr.sbin/amd/include/Makefile
View File

@ -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>

1
usr.sbin/amd/mk-amd-map/Makefile
View File

@ -9,6 +9,5 @@
.PATH: ${.CURDIR}/../../../contrib/amd/mk-amd-map
PROG= mk-amd-map
SRCS= mk-amd-map.c
.include <bsd.prog.mk>

1
usr.sbin/amd/wire-test/Makefile
View File

@ -9,7 +9,6 @@
.PATH: ${.CURDIR}/../../../contrib/amd/wire-test
PROG= wire-test
SRCS= wire-test.c
DPADD+= ${LIBAMU}
LDADD+= ${LIBAMU}