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

Cleanup: Remove minix.bootprog.mk

Browse source 
The build system distinction between "bootprog" and "service" is
meaningless as boot programs are standard services.

As minix.service.mk simply imports minix.bootprog.mk, reduce confusion
by removing minix.bootprog.mk and placing the rules in minix.service.mk.

Change-Id: I4056b1e574bed59a8c890239b41b1a7c7cad63e8
This commit is contained in:
Lionel Sambuc 2013-02-28 11:06:24 +01:00
parent fcdf1f4a55
commit 8f3fbf7cc1
16 changed files with 33 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
distrib/sets/lists/minix/mi
View file

@ -3893,7 +3893,7 @@
./usr/share/mk/bsd.sys.mk minix-sys
./usr/share/mk/bsd.test.mk minix-sys
./usr/share/mk/bsd.x11.mk minix-sys
./usr/share/mk/minix.bootprog.mk minix-sys
./usr/share/mk/minix.bootprog.mk minix-sys obsolete
./usr/share/mk/minix.gcc.mk minix-sys obsolete
./usr/share/mk/minix.gcov.mk minix-sys
./usr/share/mk/minix.service.mk minix-sys

2
drivers/log/Makefile
View file

@ -9,4 +9,4 @@ MAN=
BINDIR?= /usr/sbin
.include <minix.bootprog.mk>
.include <minix.service.mk>

2
drivers/memory/Makefile
View file

@ -36,4 +36,4 @@ CLEANFILES+= imgrd.mfs
imgrd.mfs: ../ramdisk/image
${HOST_LN} -fs ../ramdisk/image $@
.include <minix.bootprog.mk>
.include <minix.service.mk>

2
drivers/tty/Makefile
View file

@ -18,5 +18,5 @@ SUBDIR= keymaps
# Needs kernel/const.h, etc
CPPFLAGS+= -I${.CURDIR} -I${NETBSDSRCDIR}
.include <minix.bootprog.mk>
.include <minix.service.mk>
.include <bsd.subdir.mk>

4
kernel/Makefile
View file

@ -24,7 +24,7 @@ CPPFLAGS+= -D__kernel__
# kernel headers are always called through kernel/*.h
CPPFLAGS+= -I${NETBSDSRCDIR}
# kernel headers are always called through kernel/*.hi, this
# kernel headers are always called through kernel/*.h, this
# time for generated headers, during cross compilation
CPPFLAGS+= -I${.OBJDIR}/..
@ -86,4 +86,4 @@ extracted-mtype.h: extract-mtype.sh ../include/minix/com.h
${_MKTARGET_CREATE}
cd ${.CURDIR} ; ${HOST_SH} extract-mtype.sh > ${.OBJDIR}/extracted-mtype.h
.include <minix.bootprog.mk>
.include <minix.service.mk>

2
servers/ds/Makefile
View file

@ -9,4 +9,4 @@ MAN=
BINDIR?= /usr/sbin
.include <minix.bootprog.mk>
.include <minix.service.mk>

2
servers/mfs/Makefile
View file

@ -15,4 +15,4 @@ BINDIR?= /sbin
DEFAULT_NR_BUFS= 1024
CPPFLAGS+= -DDEFAULT_NR_BUFS=${DEFAULT_NR_BUFS}
.include <minix.bootprog.mk>
.include <minix.service.mk>

2
servers/pfs/Makefile
View file

@ -13,4 +13,4 @@ MAN=
BINDIR?= /usr/sbin
.include <minix.bootprog.mk>
.include <minix.service.mk>

2
servers/pm/Makefile
View file

@ -28,4 +28,4 @@ CPPFLAGS.misc.c+= -I${NETBSDSRCDIR}
CPPFLAGS.schedule.c+= -I${NETBSDSRCDIR}
CPPFLAGS.utility.c+= -I${NETBSDSRCDIR}
.include <minix.bootprog.mk>
.include <minix.service.mk>

2
servers/rs/Makefile
View file

@ -17,4 +17,4 @@ BINDIR?= /usr/sbin
CPPFLAGS+= -I${NETBSDSRCDIR}
.include <minix.bootprog.mk>
.include <minix.service.mk>

2
servers/sched/Makefile
View file

@ -13,4 +13,4 @@ CPPFLAGS.main.c+= -I${NETBSDSRCDIR}
CPPFLAGS.schedule.c+= -I${NETBSDSRCDIR}
CPPFLAGS.utility.c+= -I${NETBSDSRCDIR}
.include <minix.bootprog.mk>
.include <minix.service.mk>

2
servers/vfs/Makefile
View file

@ -22,4 +22,4 @@ MAN=
BINDIR?= /usr/sbin
.include <minix.bootprog.mk>
.include <minix.service.mk>

2
servers/vm/Makefile
View file

@ -22,4 +22,4 @@ CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}
CPPFLAGS+= -I${NETBSDSRCDIR}
.include "arch/${MACHINE_ARCH}/Makefile.inc"
.include <minix.bootprog.mk>
.include <minix.service.mk>

2
share/mk/Makefile
View file

@ -16,7 +16,7 @@ FILES= bsd.README bsd.clang-analyze.mk bsd.clean.mk bsd.dep.mk bsd.doc.mk \
bsd.subdir.mk bsd.sys.mk bsd.test.mk bsd.x11.mk sys.mk
# MINIX-specific files
FILES+= minix.bootprog.mk minix.service.mk minix.gcov.mk
FILES+= minix.service.mk minix.gcov.mk
FILESDIR=/usr/share/mk
.endif

25
share/mk/minix.bootprog.mk
View file

@ -1,25 +0,0 @@
# MINIX-specific boot program options
.include <bsd.own.mk>
# LSC Static linking, order matters!
# We can't use --start-group/--end-group as they are not supported by our
# version of clang.
# 1. No default libs
LDADD+= -nodefaultlibs
# 2. Compiler-specific libs
.if !empty(CC:M*gcc)
.if (${MACHINE_ARCH} == "earm")
LDADD+= -lsys
.else
LDADD+= -lgcc -lsys -lgcc
.endif
.elif !empty(CC:M*clang)
LDADD+= -L/usr/pkg/compiler-rt/lib -lCompilerRT-Generic -lsys -lCompilerRT-Generic
.endif
# 3. Minimal C library
LDADD+= -lminc
.include <bsd.prog.mk>

19
share/mk/minix.service.mk
View file

@ -1,4 +1,21 @@
# MINIX-specific servers/drivers options
.include <bsd.own.mk>
.include <minix.bootprog.mk>
# LSC Static linking, order matters!
# We can't use --start-group/--end-group as they are not supported by our
# version of clang.
# 1. No default libs
LDADD+= -nodefaultlibs
# 2. Compiler-specific libs
.if !empty(CC:M*gcc)
LDADD+= -lsys
.elif !empty(CC:M*clang)
LDADD+= -L/usr/pkg/compiler-rt/lib -lCompilerRT-Generic -lsys -lCompilerRT-Generic
.endif
# 3. Minimal C library
LDADD+= -lminc
.include <bsd.prog.mk>