sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove MINIXSRCDIR and use NETBSDSRCDIR

Browse source 
NETBSDSRCDIR is used all over the place anyway, and this reduces
our diff with NetBSD a little.
This commit is contained in:
Thomas Veerman 2012-06-06 11:16:32 +00:00
parent 657168fa10
commit f93afa00e9
48 changed files with 65 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
commands/badblocks/Makefile
View file

@ -1,5 +1,5 @@
PROG= badblocks PROG= badblocks
CPPFLAGS+= -I${MINIXSRCDIR}/servers CPPFLAGS+= -I${NETBSDSRCDIR}/servers
MAN= MAN=
.include <bsd.prog.mk> .include <bsd.prog.mk>

2
commands/cdprobe/Makefile
View file

@ -1,5 +1,5 @@
PROG= cdprobe PROG= cdprobe
CPPFLAGS+= -I${MINIXSRCDIR}/servers CPPFLAGS+= -I${NETBSDSRCDIR}/servers
MAN= MAN=
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
commands/crontab/Makefile
View file

@ -4,10 +4,10 @@
PROG= crontab PROG= crontab
SRCS= crontab.c tab.c misc.c SRCS= crontab.c tab.c misc.c
CPPFLAGS+= -I${.CURDIR} -I${MINIXSRCDIR}/commands/cron CPPFLAGS+= -I${.CURDIR} -I${NETBSDSRCDIR}/commands/cron
BINMODE= 4755 BINMODE= 4755
MAN= MAN=
.PATH: ${MINIXSRCDIR}/commands/cron .PATH: ${NETBSDSRCDIR}/commands/cron
.include <bsd.prog.mk> .include <bsd.prog.mk>

2
commands/df/Makefile
View file

@ -1,5 +1,5 @@
PROG= df PROG= df
CPPFLAGS+= -I${MINIXSRCDIR} CPPFLAGS+= -I${NETBSDSRCDIR}
BINMODE= 4755 BINMODE= 4755
MAN= MAN=

2
commands/dumpcore/Makefile
View file

@ -1,5 +1,5 @@
PROG= dumpcore PROG= dumpcore
CPPFLAGS+= -I${MINIXSRCDIR} CPPFLAGS+= -I${NETBSDSRCDIR}
MAN= MAN=
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
commands/fsck.mfs/Makefile
View file

@ -1,7 +1,7 @@
FSCK= ${MINIXSRCDIR}/sbin/fsck FSCK= ${NETBSDSRCDIR}/sbin/fsck
PROG= fsck.mfs PROG= fsck.mfs
SRCS= fsck.c SRCS= fsck.c
CPPFLAGS+= -I${MINIXSRCDIR}/servers -I${FSCK} CPPFLAGS+= -I${NETBSDSRCDIR}/servers -I${FSCK}
BINDIR= /sbin BINDIR= /sbin
MAN= MAN=

2
commands/mdb/Makefile
View file

@ -19,7 +19,7 @@ DEF_GNU= -DGNU_SUPPORT
EXTRA_SRCS= ${FOR_GNU} ${FOR_SYSCALLS} EXTRA_SRCS= ${FOR_GNU} ${FOR_SYSCALLS}
EXTRA_DEFS= ${DEF_GNU} ${DEF_SYSCALLS} ${DEF_DEBUG} EXTRA_DEFS= ${DEF_GNU} ${DEF_SYSCALLS} ${DEF_DEBUG}
CPPFLAGS+= -I${MINIXSRCDIR} -I${MINIXSRCDIR}/servers \ CPPFLAGS+= -I${NETBSDSRCDIR} -I${NETBSDSRCDIR}/servers \
${EXTRA_DEFS} ${EXTRA_DEFS}
PROG= mdb PROG= mdb

2
commands/mkfs.mfs/Makefile
View file

@ -1,7 +1,7 @@
PROG= mkfs.mfs PROG= mkfs.mfs
SRCS= mkfs.c SRCS= mkfs.c
BINDIR= /sbin BINDIR= /sbin
CPPFLAGS+= -I${MINIXSRCDIR}/servers CPPFLAGS+= -I${NETBSDSRCDIR}/servers
MAN= MAN=
.include <bsd.prog.mk> .include <bsd.prog.mk>

2
commands/mount/Makefile
View file

@ -1,5 +1,5 @@
PROG= mount PROG= mount
CPPFLAGS+= -I${MINIXSRCDIR}/servers CPPFLAGS+= -I${NETBSDSRCDIR}/servers
BINDIR= /bin BINDIR= /bin
BINMODE= 4755 BINMODE= 4755
MAN= MAN=

2
commands/service/Makefile
View file

@ -7,6 +7,6 @@ BINDIR= /bin
MAN.service= MAN.service=
MAN.printconfig= MAN.printconfig=
CPPFLAGS+= -I${MINIXSRCDIR} CPPFLAGS+= -I${NETBSDSRCDIR}
.include <bsd.prog.mk> .include <bsd.prog.mk>

2
commands/tcpdp/Makefile
View file

@ -5,6 +5,6 @@ SRCS= tcpd.c
CPPFLAGS+= -DPARANOID=1 CPPFLAGS+= -DPARANOID=1
MAN= MAN=
.PATH: ${MINIXSRCDIR}/commands/tcpd .PATH: ${NETBSDSRCDIR}/commands/tcpd
.include <bsd.prog.mk> .include <bsd.prog.mk>

2
commands/tcpstat/Makefile
View file

@ -1,5 +1,5 @@
PROG= tcpstat PROG= tcpstat
CPPFLAGS+= -I${MINIXSRCDIR}/servers -D'ARGS(a)=a' CPPFLAGS+= -I${NETBSDSRCDIR}/servers -D'ARGS(a)=a'
MAN= MAN=
.include <bsd.prog.mk> .include <bsd.prog.mk>

2
commands/udpstat/Makefile
View file

@ -1,5 +1,5 @@
PROG= udpstat PROG= udpstat
CPPFLAGS+= -I${MINIXSRCDIR}/servers -D'ARGS(a)=a' CPPFLAGS+= -I${NETBSDSRCDIR}/servers -D'ARGS(a)=a'
MAN= MAN=
.include <bsd.prog.mk> .include <bsd.prog.mk>

2
commands/zdump/Makefile
View file

@ -6,6 +6,6 @@ TZDIR= /usr/share/zoneinfo
CPPFLAGS+= -DHAVE_ADJTIME=0 -DTZDIR=\"$(TZDIR)\" CPPFLAGS+= -DHAVE_ADJTIME=0 -DTZDIR=\"$(TZDIR)\"
MAN= zdump.8 MAN= zdump.8
.PATH: ${MINIXSRCDIR}/lib/libc/time .PATH: ${NETBSDSRCDIR}/lib/libc/time
.include <bsd.prog.mk> .include <bsd.prog.mk>

2
common/include/Makefile.termios.inc
View file

@ -1,6 +1,6 @@
.include <bsd.own.mk> .include <bsd.own.mk>
.PATH: ${MINIXSRCDIR}/common/include .PATH: ${NETBSDSRCDIR}/common/include
INCS+= termios.h INCS+= termios.h

2
common/include/sys/Makefile.inc
View file

@ -1,6 +1,6 @@
.include <bsd.own.mk> .include <bsd.own.mk>
.PATH: ${MINIXSRCDIR}/common/include/sys .PATH: ${NETBSDSRCDIR}/common/include/sys
INCS+= elf64.h elf_common.h elf_generic.h \ INCS+= elf64.h elf_common.h elf_generic.h \
ioc_block.h ioc_fbd.h ioc_file.h ioc_tape.h ioc_disk.h \ ioc_block.h ioc_fbd.h ioc_file.h ioc_tape.h ioc_disk.h \

2
common/include/sys/Makefile.mount.inc
View file

@ -1,5 +1,5 @@
.include <bsd.own.mk> .include <bsd.own.mk>
.PATH: ${MINIXSRCDIR}/common/include/sys .PATH: ${NETBSDSRCDIR}/common/include/sys
INCS+= mount.h INCS+= mount.h

2
drivers/memory/Makefile
View file

@ -12,7 +12,7 @@ MAN=
BINDIR?= /usr/sbin BINDIR?= /usr/sbin
CPPFLAGS.memory.c+= -I${MINIXSRCDIR} CPPFLAGS.memory.c+= -I${NETBSDSRCDIR}
imgrd.d: touch-genfiles imgrd.d: touch-genfiles
touch-genfiles: touch-genfiles:

2
drivers/orinoco/Makefile
View file

@ -9,6 +9,6 @@ MAN=
BINDIR?= /usr/sbin BINDIR?= /usr/sbin
CPPFLAGS.orinoco.c+= -I${MINIXSRCDIR} CPPFLAGS.orinoco.c+= -I${NETBSDSRCDIR}
.include <minix.service.mk> .include <minix.service.mk>

2
drivers/ramdisk/Makefile
View file

@ -27,7 +27,7 @@ PROTO= proto.small
PROG_DRIVERS+= acpi PROG_DRIVERS+= acpi
.endif .endif
CPPFLAGS+= -I${MINIXSRCDIR}/servers -I${MINIXSRCDIR} CPPFLAGS+= -I${NETBSDSRCDIR}/servers
CLEANFILES += $(PROGRAMS) $(SCRIPTS) $(EXTRA) image image.c t proto.gen CLEANFILES += $(PROGRAMS) $(SCRIPTS) $(EXTRA) image image.c t proto.gen
CLEANFILES += $(LIBRARIES) pwd.db spwd.db CLEANFILES += $(LIBRARIES) pwd.db spwd.db

2
drivers/random/Makefile
View file

@ -11,7 +11,7 @@ MAN=
BINDIR?= /usr/sbin BINDIR?= /usr/sbin
CPPFLAGS.random.c+= -I${MINIXSRCDIR} CPPFLAGS.random.c+= -I${NETBSDSRCDIR}
.include <minix.service.mk> .include <minix.service.mk>

2
drivers/rtl8139/Makefile
View file

@ -13,6 +13,6 @@ MAN=
BINDIR?= /usr/sbin BINDIR?= /usr/sbin
CPPFLAGS+= -I${MINIXSRCDIR} CPPFLAGS+= -I${NETBSDSRCDIR}
.include <minix.service.mk> .include <minix.service.mk>

2
drivers/rtl8169/Makefile
View file

@ -13,6 +13,6 @@ MAN=
BINDIR?= /usr/sbin BINDIR?= /usr/sbin
CPPFLAGS+= -I${MINIXSRCDIR} CPPFLAGS+= -I${NETBSDSRCDIR}
.include <minix.service.mk> .include <minix.service.mk>

2
drivers/tty/Makefile
View file

@ -13,7 +13,7 @@ BINDIR?= /usr/sbin
SUBDIR= keymaps SUBDIR= keymaps
# Needs kernel/const.h, etc # Needs kernel/const.h, etc
CPPFLAGS+= -I${MINIXSRCDIR} CPPFLAGS+= -I${NETBSDSRCDIR}
.include <minix.bootprog.mk> .include <minix.bootprog.mk>
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

2
include/arch/i386/include/Makefile.inc
View file

@ -1,5 +1,5 @@
.include <bsd.own.mk> .include <bsd.own.mk>
.PATH: ${MINIXSRCDIR}/common/include/arch/i386 .PATH: ${NETBSDSRCDIR}/common/include/arch/i386
INCS+= archtypes.h bios.h cmos.h cpu.h diskparm.h fpu.h int86.h \ INCS+= archtypes.h bios.h cmos.h cpu.h diskparm.h fpu.h int86.h \
interrupt.h memory.h multiboot.h partition.h \ interrupt.h memory.h multiboot.h partition.h \

4
include/minix/Makefile
View file

@ -6,7 +6,7 @@ INCSDIR= /usr/include/minix
INCS+= dirent.h paths.h types.h INCS+= dirent.h paths.h types.h
.include "${MINIXSRCDIR}/common/include/sys/Makefile.mount.inc" .include "${NETBSDSRCDIR}/common/include/sys/Makefile.mount.inc"
.include "${MINIXSRCDIR}/common/include/Makefile.termios.inc" .include "${NETBSDSRCDIR}/common/include/Makefile.termios.inc"
.include <bsd.kinc.mk> .include <bsd.kinc.mk>

2
include/sys/Makefile
View file

@ -55,7 +55,7 @@ namei: namei.src gennameih.awk
${TOOL_AWK} -f gennameih.awk < namei.src ${TOOL_AWK} -f gennameih.awk < namei.src
.include <bsd.own.mk> .include <bsd.own.mk>
.include "${MINIXSRCDIR}/common/include/sys/Makefile.inc" .include "${NETBSDSRCDIR}/common/include/sys/Makefile.inc"
.include <bsd.files.mk> .include <bsd.files.mk>
.include <bsd.kinc.mk> .include <bsd.kinc.mk>

2
kernel/Makefile
View file

@ -25,7 +25,7 @@ LDADD+= -L/usr/pkg/compiler-rt/lib -lCompilerRT-Generic -lsys -lCompilerRT-Gener
DPADD+= ${LIBC} DPADD+= ${LIBC}
.endif .endif
CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${ARCH}/include -I${MINIXSRCDIR} CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${ARCH}/include -I${NETBSDSRCDIR}
BINDIR= /usr/sbin BINDIR= /usr/sbin
MAN= MAN=

4
lib/libc/gen/Makefile.inc
View file

@ -213,8 +213,8 @@ CPPFLAGS.tolower_.c+= -I${LIBCDIR}/locale
CPPFLAGS.toupper_.c+= -I${LIBCDIR}/locale CPPFLAGS.toupper_.c+= -I${LIBCDIR}/locale
.if defined(__MINIX) .if defined(__MINIX)
errlist.c: errlist.awk ${MINIXSRCDIR}/include/sys/errno.h errlist.c: errlist.awk ${NETBSDSRCDIR}/include/sys/errno.h
cat ${MINIXSRCDIR}/include/sys/errno.h | ${TOOL_SED} 's/(_SIGN//' | ${TOOL_AWK} -f ${MINIXSRCDIR}/lib/libc/gen/errlist.awk > ${.TARGET} cat ${NETBSDSRCDIR}/include/sys/errno.h | ${TOOL_SED} 's/(_SIGN//' | ${TOOL_AWK} -f ${NETBSDSRCDIR}/lib/libc/gen/errlist.awk > ${.TARGET}
.else .else
errlist.c: errlist.awk ${NETBSDSRCDIR}/sys/sys/errno.h errlist.c: errlist.awk ${NETBSDSRCDIR}/sys/sys/errno.h
${TOOL_AWK} -f ${.ALLSRC} > ${.TARGET} ${TOOL_AWK} -f ${.ALLSRC} > ${.TARGET}

1
lib/libc/minix-config.inc
View file

@ -1,4 +1,3 @@
NETBSDSRCDIR= ${MINIXSRCDIR}
NETBSDINCLUDES= /usr/include/ NETBSDINCLUDES= /usr/include/
CITRUS=yes CITRUS=yes

2
lib/libcompat_minix/include/Makefile.inc
View file

@ -1,4 +1,4 @@
.PATH: ${MINIXSRCDIR}/lib/libcompat_minix/include .PATH: ${NETBSDSRCDIR}/lib/libcompat_minix/include
INCSDIR= /usr/include INCSDIR= /usr/include

2
lib/libddekit/build/ddekit/Makefile
View file

@ -1,7 +1,7 @@
LIB= ddekit LIB= ddekit
SRC_DIR = ${MINIXSRCDIR}/lib/libddekit/src SRC_DIR = ${NETBSDSRCDIR}/lib/libddekit/src
VPATH = $(SRC_DIR) VPATH = $(SRC_DIR)

2
lib/libddekit/build/ddekit_usb_client/Makefile
View file

@ -1,6 +1,6 @@
LIB= ddekit_usb_client LIB= ddekit_usb_client
SRC_DIR = ${MINIXSRCDIR}/lib/libddekit/src SRC_DIR = ${NETBSDSRCDIR}/lib/libddekit/src
VPATH = $(SRC_DIR) VPATH = $(SRC_DIR)

2
lib/libddekit/build/ddekit_usb_server/Makefile
View file

@ -1,5 +1,5 @@
LIB= ddekit_usb_server LIB= ddekit_usb_server
SRC_DIR = ${MINIXSRCDIR}/lib/libddekit/src SRC_DIR = ${NETBSDSRCDIR}/lib/libddekit/src
VPATH = $(SRC_DIR) VPATH = $(SRC_DIR)
SRCS = usb_server.c SRCS = usb_server.c
CFLAGS += -Wall CFLAGS += -Wall

2
lib/libl/Makefile
View file

@ -7,6 +7,6 @@ SRCS= libmain.c libyywrap.c
LINKS= ${LIBDIR}/libl.a ${LIBDIR}/libfl.a LINKS= ${LIBDIR}/libl.a ${LIBDIR}/libfl.a
.PATH: ${MINIXSRCDIR}/commands/lex .PATH: ${NETBSDSRCDIR}/commands/lex
.include <bsd.lib.mk> .include <bsd.lib.mk>

10
lib/libminc/Makefile
View file

@ -6,16 +6,16 @@
LIB= minc LIB= minc
CPPFLAGS.sched_start.c+= -I${MINIXSRCDIR} CPPFLAGS.sched_start.c+= -I${NETBSDSRCDIR}
LIBCSRCDIR=${MINIXSRCDIR}/lib/libc LIBCSRCDIR=${NETBSDSRCDIR}/lib/libc
MACHINE_ARCH=${MACHINE} MACHINE_ARCH=${MACHINE}
# #
# Shared libc with userspace (/common/lib/libc) # Shared libc with userspace (/common/lib/libc)
# #
.include "${MINIXSRCDIR}/common/lib/libc/Makefile.inc" .include "${NETBSDSRCDIR}/common/lib/libc/Makefile.inc"
.include "${.CURDIR}/arch/${MACHINE}/Makefile.libc.inc" .include "${.CURDIR}/arch/${MACHINE}/Makefile.libc.inc"
.if empty(SRCS:Mbyte_swap_8.*) .if empty(SRCS:Mbyte_swap_8.*)
SRCS+= bswap64.c SRCS+= bswap64.c
@ -75,8 +75,8 @@ CPPFLAGS.${i}+= -I${LIBCSRCDIR}/stdlib -I${LIBCSRCDIR}/include
# Import from gen # Import from gen
errlist.c: ${LIBCSRCDIR}/gen/errlist.awk \ errlist.c: ${LIBCSRCDIR}/gen/errlist.awk \
${MINIXSRCDIR}/include/sys/errno.h ${NETBSDSRCDIR}/include/sys/errno.h
cat ${MINIXSRCDIR}/include/sys/errno.h | ${TOOL_SED} 's/(_SIGN//' | ${TOOL_AWK} -f ${LIBCSRCDIR}/gen/errlist.awk > ${.TARGET} cat ${NETBSDSRCDIR}/include/sys/errno.h | ${TOOL_SED} 's/(_SIGN//' | ${TOOL_AWK} -f ${LIBCSRCDIR}/gen/errlist.awk > ${.TARGET}
.for i in assert.c _errno.c errno.c _env.c errlist.c \ .for i in assert.c _errno.c errno.c _env.c errlist.c \
execle.c getprogname.c sleep.c time.c \ execle.c getprogname.c sleep.c time.c \

4
lib/libminlib/Makefile
View file

@ -5,8 +5,8 @@ LIB= minlib
USE_SHLIBDIR= yes USE_SHLIBDIR= yes
CPPFLAGS.fslib.c+= -I${MINIXSRCDIR}/servers CPPFLAGS.fslib.c+= -I${NETBSDSRCDIR}/servers
CPPFLAGS.fsversion.c+= -I${MINIXSRCDIR}/servers CPPFLAGS.fsversion.c+= -I${NETBSDSRCDIR}/servers
SRCS+= fslib.c fsversion.c SRCS+= fslib.c fsversion.c
# DHCP get/set tags. # DHCP get/set tags.

2
lib/libsys/Makefile
View file

@ -143,7 +143,7 @@ CPPFLAGS+= -DUSE_LIVEUPDATE
CPPFLAGS+= -DUSE_SYSDEBUG CPPFLAGS+= -DUSE_SYSDEBUG
.endif .endif
CPPFLAGS.sched_start.c+= -I${MINIXSRCDIR} CPPFLAGS.sched_start.c+= -I${NETBSDSRCDIR}
.if (${CC} == "gcc") || (${CC} == "clang") .if (${CC} == "gcc") || (${CC} == "clang")
LDADD+= -lminc LDADD+= -lminc

4
lib/libterminfo/genterms
View file

@ -31,8 +31,8 @@
set -e set -e
: ${TOOL_TIC:=tic} : ${TOOL_TIC:=tic}
: ${MINIXSRCDIR:=/usr/src} : ${NETBSDSRCDIR:=/usr/src}
: ${TERMINFO:=${MINIXSRCDIR}/share/terminfo/terminfo} : ${TERMINFO:=${NETBSDSRCDIR}/share/terminfo/terminfo}
echo "/* \$NetBSD\$ */" echo "/* \$NetBSD\$ */"
echo "/* * * MODIFIED FOR MINIX * * */" echo "/* * * MODIFIED FOR MINIX * * */"

1
lib/libterminfo/minix-config.inc
View file

@ -1,4 +1,3 @@
NETBSDSRCDIR= ${MINIXSRCDIR}
NETBSDINCLUDES= /usr/include/ NETBSDINCLUDES= /usr/include/
CPPFLAGS+= -D_NETBSD_SOURCE CPPFLAGS+= -D_NETBSD_SOURCE

6
servers/is/Makefile
View file

@ -13,9 +13,9 @@ MAN=
BINDIR?= /sbin BINDIR?= /sbin
CPPFLAGS.dmp_kernel.c+= -I${MINIXSRCDIR} CPPFLAGS.dmp_kernel.c+= -I${NETBSDSRCDIR}
CPPFLAGS.dmp_rs.c+= -I${MINIXSRCDIR} CPPFLAGS.dmp_rs.c+= -I${NETBSDSRCDIR}
CPPFLAGS.dmp_vm.c+= -I${MINIXSRCDIR} CPPFLAGS.dmp_vm.c+= -I${NETBSDSRCDIR}
# This setting must match the kernel's, as it affects the IRQ hooks table size. # This setting must match the kernel's, as it affects the IRQ hooks table size.
.if ${USE_APIC} != "no" .if ${USE_APIC} != "no"

8
servers/pm/Makefile
View file

@ -23,9 +23,9 @@ MAN=
BINDIR?= /usr/sbin BINDIR?= /usr/sbin
CPPFLAGS.main.c+= -I${MINIXSRCDIR} CPPFLAGS.main.c+= -I${NETBSDSRCDIR}
CPPFLAGS.misc.c+= -I${MINIXSRCDIR} CPPFLAGS.misc.c+= -I${NETBSDSRCDIR}
CPPFLAGS.schedule.c+= -I${MINIXSRCDIR} CPPFLAGS.schedule.c+= -I${NETBSDSRCDIR}
CPPFLAGS.utility.c+= -I${MINIXSRCDIR} CPPFLAGS.utility.c+= -I${NETBSDSRCDIR}
.include <minix.bootprog.mk> .include <minix.bootprog.mk>

2
servers/procfs/Makefile
View file

@ -6,7 +6,7 @@
PROG= procfs PROG= procfs
SRCS= buf.c main.c pid.c root.c tree.c util.c cpuinfo.c SRCS= buf.c main.c pid.c root.c tree.c util.c cpuinfo.c
CPPFLAGS+= -I${MINIXSRCDIR} -I${MINIXSRCDIR}/servers CPPFLAGS+= -I${NETBSDSRCDIR} -I${NETBSDSRCDIR}/servers
DPADD+= ${LIBVTREEFS} ${LIBSYS} DPADD+= ${LIBVTREEFS} ${LIBSYS}
LDADD+= -lvtreefs -lsys LDADD+= -lvtreefs -lsys

2
servers/rs/Makefile
View file

@ -9,6 +9,6 @@ MAN=
BINDIR?= /usr/sbin BINDIR?= /usr/sbin
CPPFLAGS+= -I${MINIXSRCDIR} CPPFLAGS+= -I${NETBSDSRCDIR}
.include <minix.bootprog.mk> .include <minix.bootprog.mk>

6
servers/sched/Makefile
View file

@ -9,8 +9,8 @@ MAN=
BINDIR?= /usr/sbin BINDIR?= /usr/sbin
CPPFLAGS.main.c+= -I${MINIXSRCDIR} CPPFLAGS.main.c+= -I${NETBSDSRCDIR}
CPPFLAGS.schedule.c+= -I${MINIXSRCDIR} CPPFLAGS.schedule.c+= -I${NETBSDSRCDIR}
CPPFLAGS.utility.c+= -I${MINIXSRCDIR} CPPFLAGS.utility.c+= -I${NETBSDSRCDIR}
.include <minix.bootprog.mk> .include <minix.bootprog.mk>

2
servers/vm/Makefile
View file

@ -14,7 +14,7 @@ MAN=
BINDIR?= /usr/sbin BINDIR?= /usr/sbin
CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${ARCH} CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${ARCH}
CPPFLAGS+= -I${MINIXSRCDIR} CPPFLAGS+= -I${NETBSDSRCDIR}
.include "arch/${ARCH}/Makefile.inc" .include "arch/${ARCH}/Makefile.inc"
.include <minix.bootprog.mk> .include <minix.bootprog.mk>

34
share/mk/bsd.own.mk
View file

@ -94,40 +94,6 @@ PRINTOBJDIR= echo # prevent infinite recursion
.endif .endif
#
# Determine if running in the MINIX source tree by checking for the
# existence of usr.bin and tools/ in the current or a parent directory,
# and setting _MSRC_TOP_ to the result.
#
.if !defined(_MSRC_TOP_) # {
_MSRC_TOP_!= cd ${.CURDIR}; while :; do \
here=`pwd`; \
[ -d usr.bin ] && [ -d tools ] && { echo $$here; break; }; \
case $$here in /) echo ""; break;; esac; \
cd ..; done
.MAKEOVERRIDES+= _MSRC_TOP_
.endif # }
#
# If _MSRC_TOP_ != "", we're within the MINIX source tree, so set
# defaults for MINIXSRCDIR and _MSRC_TOP_OBJ_.
#
.if (${_MSRC_TOP_} != "") # {
MINIXSRCDIR?= ${_MSRC_TOP_}
.if !defined(_MSRC_TOP_OBJ_)
_MSRC_TOP_OBJ_!= cd ${_MSRC_TOP_} && ${PRINTOBJDIR}
.MAKEOVERRIDES+= _MSRC_TOP_OBJ_
.endif
.endif # _MSRC_TOP_ != "" # }
# #
# Determine if running in the NetBSD source tree by checking for the # Determine if running in the NetBSD source tree by checking for the
# existence of build.sh and tools/ in the current or a parent directory, # existence of build.sh and tools/ in the current or a parent directory,

8
tools/Makefile
View file

@ -127,15 +127,15 @@ nbsd_fetch:
date=$$1; minixpath=$$2; origpath=$$3; \ date=$$1; minixpath=$$2; origpath=$$3; \
if [ $$# -lt 3 ]; then origpath=$$2; fi; \ if [ $$# -lt 3 ]; then origpath=$$2; fi; \
echo "retrieving $$origpath .."; \ echo "retrieving $$origpath .."; \
cd ${MINIXSRCDIR} && cvs -q -d ${NBSD_CVSROOT} co -N -D "$$date UTC" -d nbsdsrc "src/$$origpath" ; \ cd ${NETBSDSRCDIR} && cvs -q -d ${NBSD_CVSROOT} co -N -D "$$date UTC" -d nbsdsrc "src/$$origpath" ; \
done done
nbsd_diff: nbsd_diff:
find ${MINIXSRCDIR} -name minix-port.patch | xargs rm find ${NETBSDSRCDIR} -name minix-port.patch | xargs rm
cat nbsd_ports | grep -v '^#' | \ cat nbsd_ports | grep -v '^#' | \
( cd ${MINIXSRCDIR} && awk -F, '{ minixpath=$$2; origpath=$$3; if(NF < 3) { origpath=$$2; } system("sh tools/nbsd_diff.sh " \ ( cd ${NETBSDSRCDIR} && awk -F, '{ minixpath=$$2; origpath=$$3; if(NF < 3) { origpath=$$2; } system("sh tools/nbsd_diff.sh " \
"nbsdsrc/src/"origpath" "minixpath" "minixpath"/minix-port.patch");}' ) "nbsdsrc/src/"origpath" "minixpath" "minixpath"/minix-port.patch");}' )
find ${MINIXSRCDIR} -name minix-port.patch | xargs wc -l | sort -n find ${NETBSDSRCDIR} -name minix-port.patch | xargs wc -l | sort -n
# clean up compile results # clean up compile results