Cleanup: Remove minix.bootprog.mk

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

diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi
index 63cbc4711428254b616143ff9755012328994a7d..b6f4c5edb65798bdc4d4c043c6797e222cea7247 100644 (file)
--- a/distrib/sets/lists/minix/mi
+++ b/distrib/sets/lists/minix/mi
@@ -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

diff --git a/drivers/log/Makefile b/drivers/log/Makefile
index 87e9d256dd95bee7b443f643fb5f6bffebd73d21..7c197e7dfa7afd0e7fac6196634f0dfed0ad9033 100644 (file)
--- a/drivers/log/Makefile
+++ b/drivers/log/Makefile
@@ -9,4 +9,4 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-.include <minix.bootprog.mk>
+.include <minix.service.mk>

diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile
index ce0debae4f5d0cfcd14e99e43c960cc993293f96..e8a6f5a27035f60816716f93a403b3cb3661a97a 100644 (file)
--- a/drivers/memory/Makefile
+++ b/drivers/memory/Makefile
@@ -36,4 +36,4 @@ CLEANFILES+=  imgrd.mfs
 imgrd.mfs: ../ramdisk/image
        ${HOST_LN} -fs ../ramdisk/image $@
 
-.include <minix.bootprog.mk>
+.include <minix.service.mk>

diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
index d609aad75e3e924a6a0ace83fee4908e9041d31b..6f0336eac823a09e09cdfae1b51b0661d877d01d 100644 (file)
--- a/drivers/tty/Makefile
+++ b/drivers/tty/Makefile
@@ -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>

diff --git a/kernel/Makefile b/kernel/Makefile
index a55dbdf285e4935eba2fb4c9745dd6368545a3f0..0a1d6f7f78dbf64afa3072a75af75ae5d3801b20 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -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>

diff --git a/servers/ds/Makefile b/servers/ds/Makefile
index a7449af03b583b938e15cae9d90c1d4dac1b3fb5..c7cad6605710de1bab228033b9f2fb9e19c8eee4 100644 (file)
--- a/servers/ds/Makefile
+++ b/servers/ds/Makefile
@@ -9,4 +9,4 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-.include <minix.bootprog.mk>
+.include <minix.service.mk>

diff --git a/servers/mfs/Makefile b/servers/mfs/Makefile
index c9fec9dc8383602d50c195c4389d3b2b03cc7fca..1371c697da72da2e42b9c22ab82e89a696fdfa93 100644 (file)
--- a/servers/mfs/Makefile
+++ b/servers/mfs/Makefile
@@ -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>

diff --git a/servers/pfs/Makefile b/servers/pfs/Makefile
index 98ec55b3f1aab8473008b28dcf2462851476de89..f4b0cb699b528bd54354f632febe9427405ed50b 100644 (file)
--- a/servers/pfs/Makefile
+++ b/servers/pfs/Makefile
@@ -13,4 +13,4 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-.include <minix.bootprog.mk>
+.include <minix.service.mk>

diff --git a/servers/pm/Makefile b/servers/pm/Makefile
index 906543213b8f7c92dbd63871ff7733fe20a4ac01..5a64169c0f4b8aab901e9b5a4b2323e0eae40db3 100644 (file)
--- a/servers/pm/Makefile
+++ b/servers/pm/Makefile
@@ -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>

diff --git a/servers/rs/Makefile b/servers/rs/Makefile
index 7c41b2ee3aea59af064f51f928b2cfc89eafa2cf..fc6804dbf96f1a81edc81543a986d8548256470b 100644 (file)
--- a/servers/rs/Makefile
+++ b/servers/rs/Makefile
@@ -17,4 +17,4 @@ BINDIR?= /usr/sbin
 
 CPPFLAGS+=     -I${NETBSDSRCDIR}
 
-.include <minix.bootprog.mk>
+.include <minix.service.mk>

diff --git a/servers/sched/Makefile b/servers/sched/Makefile
index ebfc56cd5314b1b46610366f0a685292ae1f5236..72f1b2003bdfe3ca9cab39f8f3a815c949cad72a 100644 (file)
--- a/servers/sched/Makefile
+++ b/servers/sched/Makefile
@@ -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>

diff --git a/servers/vfs/Makefile b/servers/vfs/Makefile
index b3a2031158207aaefa6d84e352dafa3dfd2b41ac..083a5675c1cf55fa36330ea8d24844ccdc85ed36 100644 (file)
--- a/servers/vfs/Makefile
+++ b/servers/vfs/Makefile
@@ -22,4 +22,4 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-.include <minix.bootprog.mk>
+.include <minix.service.mk>

diff --git a/servers/vm/Makefile b/servers/vm/Makefile
index a0f416ceff15e27261a8ea2bddc6e254041e87c4..db7d8c26e92c9e6acec2518769f494d3aef12dcc 100644 (file)
--- a/servers/vm/Makefile
+++ b/servers/vm/Makefile
@@ -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>

diff --git a/share/mk/Makefile b/share/mk/Makefile
index 2ced9842a8111dbab4487eb09987a01ae999efe9..fc0fa6e2e45ef1d9463717ab6c567e3bd18d617d 100644 (file)
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -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

diff --git a/share/mk/minix.bootprog.mk b/share/mk/minix.bootprog.mk
deleted file mode 100644 (file)
index bb5bcb0..0000000
--- a/share/mk/minix.bootprog.mk
+++ /dev/null
@@ -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>

diff --git a/share/mk/minix.service.mk b/share/mk/minix.service.mk
index cfdf9cbc780f4f4375f5c0e0dddbdebf6348977a..037fbe901aac67535152455f5a44bcdb0e0692a8 100644 (file)
--- a/share/mk/minix.service.mk
+++ b/share/mk/minix.service.mk
@@ -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>