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

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

share/mk/minix.bootprog.mk

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

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>