reference the ufs/[uf]fs headers in ../../sys rather than using those
in /usr/include. this should make it easier to make this a host tool
This commit is contained in:
lukem
parent
3f9a8628df
commit
b7eb0e9a18
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.2 2001/10/26 16:12:30 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.3 2001/11/22 02:47:25 lukem Exp $
|
||||
#
|
||||
|
||||
PROG= makefs
|
||||
|
|
@ -7,14 +7,16 @@ SRCS= makefs.c walk.c \
|
|||
misc.c spec.c pack_dev.c stat_flags.c \
|
||||
ffs_alloc.c ffs_balloc.c ffs_bswap.c ffs_subr.c ffs_tables.c ufs_bmap.c
|
||||
MAN= makefs.8
|
||||
LDADD+=-lutil
|
||||
DPADD+= ${LIBUTIL}
|
||||
LDADD+= -lutil
|
||||
|
||||
LSSRC= ${.CURDIR}/../../bin/ls
|
||||
MKNODSRC= ${.CURDIR}/../../sbin/mknod
|
||||
MTREESRC= ${.CURDIR}/../../usr.sbin/mtree
|
||||
SYSSRC= ${.CURDIR}/../../sys
|
||||
|
||||
CPPFLAGS+= -I${.CURDIR} -I${LSSRC} -I${MKNODSRC} -I${MTREESRC}
|
||||
.PATH: ${.CURDIR}/ffs ${.CURDIR}/../../sys/ufs/ffs \
|
||||
CPPFLAGS+= -I${.CURDIR} -I${SYSSRC} -I${LSSRC} -I${MKNODSRC} -I${MTREESRC}
|
||||
.PATH: ${.CURDIR}/ffs ${SYSSRC}/ufs/ffs \
|
||||
${LSSRC} ${MKNODSRC} ${MTREESRC}
|
||||
|
||||
WARNS?= 2
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ffs.c,v 1.3 2001/11/02 03:12:48 lukem Exp $ */
|
||||
/* $NetBSD: ffs.c,v 1.4 2001/11/22 02:47:26 lukem Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2001 Wasabi Systems, Inc.
|
||||
|
|
@ -71,7 +71,7 @@
|
|||
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef __lint
|
||||
__RCSID("$NetBSD: ffs.c,v 1.3 2001/11/02 03:12:48 lukem Exp $");
|
||||
__RCSID("$NetBSD: ffs.c,v 1.4 2001/11/22 02:47:26 lukem Exp $");
|
||||
#endif /* !__lint */
|
||||
|
||||
#include <sys/param.h>
|
||||
|
|
@ -89,11 +89,11 @@ __RCSID("$NetBSD: ffs.c,v 1.3 2001/11/02 03:12:48 lukem Exp $");
|
|||
|
||||
#include "makefs.h"
|
||||
|
||||
#include <ufs/ffs/fs.h>
|
||||
#include <ufs/ufs/dir.h>
|
||||
#include <ufs/ufs/dinode.h>
|
||||
#include <ufs/ufs/inode.h>
|
||||
#include <ufs/ufs/ufs_bswap.h>
|
||||
#include "ufs/ffs/fs.h"
|
||||
#include "ufs/ufs/dir.h"
|
||||
#include "ufs/ufs/dinode.h"
|
||||
#include "ufs/ufs/inode.h"
|
||||
#include "ufs/ufs/ufs_bswap.h"
|
||||
|
||||
#include "ffs/newfs_extern.h"
|
||||
#include "ffs/ffs_extern.h"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: buf.c,v 1.3 2001/11/02 03:12:49 lukem Exp $ */
|
||||
/* $NetBSD: buf.c,v 1.4 2001/11/22 02:47:26 lukem Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2001 Wasabi Systems, Inc.
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef __lint
|
||||
__RCSID("$NetBSD: buf.c,v 1.3 2001/11/02 03:12:49 lukem Exp $");
|
||||
__RCSID("$NetBSD: buf.c,v 1.4 2001/11/22 02:47:26 lukem Exp $");
|
||||
#endif /* !__lint */
|
||||
|
||||
#include <sys/param.h>
|
||||
|
|
@ -50,8 +50,8 @@ __RCSID("$NetBSD: buf.c,v 1.3 2001/11/02 03:12:49 lukem Exp $");
|
|||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <ufs/ufs/inode.h>
|
||||
#include <ufs/ffs/fs.h>
|
||||
#include "ufs/ufs/inode.h"
|
||||
#include "ufs/ffs/fs.h"
|
||||
|
||||
#include "makefs.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ffs_alloc.c,v 1.2 2001/10/28 13:14:06 lukem Exp $ */
|
||||
/* $NetBSD: ffs_alloc.c,v 1.3 2001/11/22 02:47:26 lukem Exp $ */
|
||||
/* From: NetBSD: ffs_alloc.c,v 1.50 2001/09/06 02:16:01 lukem Exp */
|
||||
|
||||
/*
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef __lint
|
||||
__RCSID("$NetBSD: ffs_alloc.c,v 1.2 2001/10/28 13:14:06 lukem Exp $");
|
||||
__RCSID("$NetBSD: ffs_alloc.c,v 1.3 2001/11/22 02:47:26 lukem Exp $");
|
||||
#endif /* !__lint */
|
||||
|
||||
#include <sys/param.h>
|
||||
|
|
@ -47,9 +47,9 @@ __RCSID("$NetBSD: ffs_alloc.c,v 1.2 2001/10/28 13:14:06 lukem Exp $");
|
|||
#include <err.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include <ufs/ufs/ufs_bswap.h>
|
||||
#include <ufs/ufs/inode.h>
|
||||
#include <ufs/ffs/fs.h>
|
||||
#include "ufs/ufs/ufs_bswap.h"
|
||||
#include "ufs/ufs/inode.h"
|
||||
#include "ufs/ffs/fs.h"
|
||||
|
||||
#include "ffs/buf.h"
|
||||
#include "ffs/ffs_extern.h"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ffs_balloc.c,v 1.2 2001/10/28 13:14:06 lukem Exp $ */
|
||||
/* $NetBSD: ffs_balloc.c,v 1.3 2001/11/22 02:47:26 lukem Exp $ */
|
||||
/* From NetBSD: ffs_balloc.c,v 1.25 2001/08/08 08:36:36 lukem Exp */
|
||||
|
||||
/*
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef __lint
|
||||
__RCSID("$NetBSD: ffs_balloc.c,v 1.2 2001/10/28 13:14:06 lukem Exp $");
|
||||
__RCSID("$NetBSD: ffs_balloc.c,v 1.3 2001/11/22 02:47:26 lukem Exp $");
|
||||
#endif /* !__lint */
|
||||
|
||||
#include <sys/param.h>
|
||||
|
|
@ -50,9 +50,9 @@ __RCSID("$NetBSD: ffs_balloc.c,v 1.2 2001/10/28 13:14:06 lukem Exp $");
|
|||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <ufs/ufs/ufs_bswap.h>
|
||||
#include <ufs/ufs/inode.h>
|
||||
#include <ufs/ffs/fs.h>
|
||||
#include "ufs/ufs/ufs_bswap.h"
|
||||
#include "ufs/ufs/inode.h"
|
||||
#include "ufs/ffs/fs.h"
|
||||
|
||||
#include "ffs/buf.h"
|
||||
#include "ffs/ffs_extern.h"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mkfs.c,v 1.1.1.1 2001/10/26 06:21:57 lukem Exp $ */
|
||||
/* $NetBSD: mkfs.c,v 1.2 2001/11/22 02:47:26 lukem Exp $ */
|
||||
/* From NetBSD: mkfs.c,v 1.55 2001/09/06 02:16:01 lukem Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
#if 0
|
||||
static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95";
|
||||
#else
|
||||
__RCSID("$NetBSD: mkfs.c,v 1.1.1.1 2001/10/26 06:21:57 lukem Exp $");
|
||||
__RCSID("$NetBSD: mkfs.c,v 1.2 2001/11/22 02:47:26 lukem Exp $");
|
||||
#endif
|
||||
#endif /* not lint */
|
||||
|
||||
|
|
@ -53,10 +53,10 @@ __RCSID("$NetBSD: mkfs.c,v 1.1.1.1 2001/10/26 06:21:57 lukem Exp $");
|
|||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <ufs/ufs/dir.h>
|
||||
#include <ufs/ufs/inode.h>
|
||||
#include <ufs/ufs/ufs_bswap.h>
|
||||
#include <ufs/ffs/fs.h>
|
||||
#include "ufs/ufs/dir.h"
|
||||
#include "ufs/ufs/inode.h"
|
||||
#include "ufs/ufs/ufs_bswap.h"
|
||||
#include "ufs/ffs/fs.h"
|
||||
|
||||
#include "makefs.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ufs_bmap.c,v 1.3 2001/11/08 06:10:13 lukem Exp $ */
|
||||
/* $NetBSD: ufs_bmap.c,v 1.4 2001/11/22 02:47:26 lukem Exp $ */
|
||||
/* From: NetBSD: ufs_bmap.c,v 1.14 2001/11/08 05:00:51 chs Exp */
|
||||
|
||||
/*
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef __lint
|
||||
__RCSID("$NetBSD: ufs_bmap.c,v 1.3 2001/11/08 06:10:13 lukem Exp $");
|
||||
__RCSID("$NetBSD: ufs_bmap.c,v 1.4 2001/11/22 02:47:26 lukem Exp $");
|
||||
#endif /* !__lint */
|
||||
|
||||
#include <sys/param.h>
|
||||
|
|
@ -52,9 +52,9 @@ __RCSID("$NetBSD: ufs_bmap.c,v 1.3 2001/11/08 06:10:13 lukem Exp $");
|
|||
#include <assert.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include <ufs/ufs/ufs_bswap.h>
|
||||
#include <ufs/ufs/inode.h>
|
||||
#include <ufs/ffs/fs.h>
|
||||
#include "ufs/ufs/ufs_bswap.h"
|
||||
#include "ufs/ufs/inode.h"
|
||||
#include "ufs/ffs/fs.h"
|
||||
|
||||
#include "ffs/buf.h"
|
||||
#include "ffs/ffs_extern.h"
|
||||
|
|
|
|||
Loading…
Reference in New Issue