Convert kernel over to bsdmake

kernel/system/Makefile

@@ -1,75 +0,0 @@
-# Makefile for system library implementation
-
-include /etc/make.conf
-
-# Directories
-u = /usr
-i = $u/include
-a = ../arch
-
-# Programs, flags, etc.
-#CC =	exec cc $(CFLAGS) -c
-CC =	exec cc
-#CCNOPROF =      exec cc $(CFLAGSNOPROF) -c      # no call profiling for these
-CPP =	$l/cpp
-LD =	$(CC) -.o
-CFLAGS = -I$i $(CPROFILE) -I$a/$(ARCH)/include
-#CFLAGSNOPROF = -I$i
-LDFLAGS = -i
-
-SYSTEM	= ../system.a
-
-# What to make.
-all build install: $(SYSTEM)
-
-OBJECTS	= \
-	do_unused.o \
-	do_fork.o \
-	do_exec.o \
-	do_newmap.o \
-	do_clear.o \
-	do_exit.o \
-	do_trace.o \
-	do_runctl.o \
-	do_update.o \
-	do_times.o \
-	do_setalarm.o \
-	do_stime.o \
-	do_vtimer.o \
-	do_irqctl.o \
-	do_devio.o \
-	do_vdevio.o \
-	do_copy.o \
-	do_umap.o \
-	do_memset.o \
-	do_setgrant.o \
-	do_privctl.o \
-	do_segctl.o \
-	do_safecopy.o \
-	do_safemap.o \
-	do_sysctl.o \
-	do_getksig.o \
-	do_endksig.o \
-	do_kill.o \
-	do_sigsend.o \
-	do_sigreturn.o \
-	do_abort.o \
-	do_getinfo.o \
-	do_sprofile.o \
-	do_cprofile.o \
-	do_profbuf.o \
-	do_vmctl.o \
-	do_mcontext.o \
-	do_schedule.o \
-	do_schedctl.o
-
-build $(SYSTEM):	$(SYSTEM)($(OBJECTS))
-	aal cr $@ *.o
-#	aal cr $@ $(OBJECTS)
-#	ar cru $(.TARGET) $(.OODATE)
-
-clean:
-	rm -f $(SYSTEM) *.o *~ *.bak 
-
-depend: 
-	mkdep "$(CC) $(CFLAGS) -E" *.c > .depend

kernel/system/Makefile.inc

@@ -0,0 +1,44 @@
+# Makefile for system library implementation
+.include <minix.own.mk>
+
+.PATH:	${.CURDIR}/system
+SRCS+= 	\
+	do_unused.c \
+	do_fork.c \
+	do_exec.c \
+	do_newmap.c \
+	do_clear.c \
+	do_exit.c \
+	do_trace.c \
+	do_runctl.c \
+	do_update.c \
+	do_times.c \
+	do_setalarm.c \
+	do_stime.c \
+	do_vtimer.c \
+	do_irqctl.c \
+	do_devio.c \
+	do_vdevio.c \
+	do_copy.c \
+	do_umap.c \
+	do_memset.c \
+	do_setgrant.c \
+	do_privctl.c \
+	do_segctl.c \
+	do_safecopy.c \
+	do_safemap.c \
+	do_sysctl.c \
+	do_getksig.c \
+	do_endksig.c \
+	do_kill.c \
+	do_sigsend.c \
+	do_sigreturn.c \
+	do_abort.c \
+	do_getinfo.c \
+	do_sprofile.c \
+	do_cprofile.c \
+	do_profbuf.c \
+	do_vmctl.c \
+	do_mcontext.c \
+	do_schedule.c \
+	do_schedctl.c

kernel/system/do_abort.c

@@ -8,7 +8,7 @@
  *    m1_p1:	ABRT_MON_ADDR 	(virtual address of params)	
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 #include <unistd.h>
 
 #if USE_ABORT

kernel/system/do_clear.c

@@ -5,7 +5,7 @@
  *    m1_i1:	PR_ENDPT		(endpoint of process to clean up)
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 
 #include <minix/endpoint.h>
 

kernel/system/do_copy.c

@@ -11,7 +11,7 @@
  *    m5_l3:	CP_NR_BYTES		number of bytes to copy
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 #include <minix/type.h>
 
 #if (USE_VIRCOPY || USE_PHYSCOPY)

kernel/system/do_cprofile.c

@@ -12,7 +12,7 @@
  *   14 Aug, 2006   Created (Rogier Meurs)
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 
 #include <string.h>
 

kernel/system/do_devio.c

@@ -7,7 +7,7 @@
  *   m2_l2:	DIO_VALUE	(value to write/ return value read)	
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 #include <minix/devio.h>
 #include <minix/endpoint.h>
 #include <minix/portio.h>

kernel/system/do_endksig.c

@@ -5,7 +5,7 @@
  *     m2_i1:	SIG_ENDPT  	# process for which PM is done
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 
 #if USE_ENDKSIG 
 

kernel/system/do_exec.c

@@ -7,7 +7,7 @@
  *    m1_p2:	PR_NAME_PTR		(pointer to program name)
  *    m1_p3:	PR_IP_PTR		(new instruction pointer)
  */
-#include "../system.h"
+#include "kernel/system.h"
 #include <string.h>
 #include <minix/endpoint.h>
 

kernel/system/do_exit.c

@@ -2,7 +2,7 @@
  *   m_type:	SYS_EXIT
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 
 #include <minix/endpoint.h>
 #include <signal.h>

kernel/system/do_fork.c

@@ -8,8 +8,8 @@
  *    m1_i3:	PR_FORK_FLAGS	(fork flags)
  */
 
-#include "../system.h"
-#include "../vm.h"
+#include "kernel/system.h"
+#include "kernel/vm.h"
 #include <signal.h>
 #include <string.h>
 #include <assert.h>

kernel/system/do_getinfo.c

@@ -12,7 +12,7 @@
 #include <string.h>
 #include <minix/endpoint.h>
 
-#include "../system.h"
+#include "kernel/system.h"
 
 
 #if USE_GETINFO

kernel/system/do_getksig.c

@@ -6,7 +6,7 @@
  *     m2_l1:	SIG_MAP		# bit map with pending signals
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 #include <signal.h>
 #include <minix/endpoint.h>
 

kernel/system/do_irqctl.c

@@ -9,7 +9,7 @@
  *      ,,          ,,          (returns index of irq hook assigned at kernel)
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 
 #include <minix/endpoint.h>
 

kernel/system/do_kill.c

@@ -6,7 +6,7 @@
  *     m2_i2:	SIG_NUMBER	# signal number to send to process
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 #include <signal.h>
 
 #if USE_KILL

kernel/system/do_mcontext.c

@@ -8,7 +8,7 @@
  *
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 #include <string.h>
 #include <machine/mcontext.h>
 

kernel/system/do_memset.c

@@ -7,7 +7,7 @@
  *    m2_l2:	MEM_PATTERN	(pattern byte to be written) 	
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 
 #if USE_MEMSET
 

kernel/system/do_newmap.c

@@ -5,7 +5,7 @@
  *    m1_i1:	PR_ENDPT		(install new map for this process)
  *    m1_p1:	PR_MEM_PTR		(pointer to the new memory map)
  */
-#include "../system.h"
+#include "kernel/system.h"
 #include <minix/endpoint.h>
 
 #if USE_NEWMAP

kernel/system/do_nice.c

@@ -6,7 +6,7 @@
  *    m1_i2:	PR_PRIORITY	the new priority
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 #include <sys/resource.h>
 
 #if USE_NICE

kernel/system/do_privctl.c

@@ -7,8 +7,8 @@
  *    m2_p1:	CTL_ARG_PTR	(pointer to request data)
  */
 
-#include "../system.h"
-#include "../ipc.h"
+#include "kernel/system.h"
+#include "kernel/ipc.h"
 #include <signal.h>
 #include <string.h>
 #include <minix/endpoint.h>

kernel/system/do_profbuf.c

@@ -9,7 +9,7 @@
  *   14 Aug, 2006   Created (Rogier Meurs)
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 
 /*===========================================================================*
  *				do_profbuf				     *

kernel/system/do_runctl.c

@@ -7,7 +7,7 @@
  *    m1_i3:	RC_FLAGS	request flags
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 
 #if USE_RUNCTL
 

kernel/system/do_safecopy.c

@@ -17,7 +17,7 @@
 #include <minix/type.h>
 #include <minix/safecopies.h>
 
-#include "../system.h"
+#include "kernel/system.h"
 
 #define MAX_INDIRECT_DEPTH 5	/* up to how many indirect grants to follow? */
 

kernel/system/do_safemap.c

@@ -17,7 +17,7 @@
 #include <minix/type.h>
 #include <minix/safecopies.h>
 
-#include "../system.h"
+#include "kernel/system.h"
 
 #include <signal.h>
 

kernel/system/do_schedctl.c

@@ -1,4 +1,4 @@
-#include "../system.h"
+#include "kernel/system.h"
 #include <signal.h>
 #include <sys/sigcontext.h>
 #include <minix/endpoint.h>

kernel/system/do_schedule.c

@@ -1,4 +1,4 @@
-#include "../system.h"
+#include "kernel/system.h"
 #include <signal.h>
 #include <sys/sigcontext.h>
 #include <minix/endpoint.h>

kernel/system/do_segctl.c

@@ -8,7 +8,7 @@
  *    m4_l2:	SEG_OFFSET	(return offset within segment here)
  *    m4_l5:	SEG_INDEX	(return index into remote memory map here)
  */
-#include "../system.h"
+#include "kernel/system.h"
 
 #if USE_SEGCTL
 

kernel/system/do_setalarm.c

@@ -7,7 +7,7 @@
  *    m2_l1:	ALRM_TIME_LEFT		(return seconds left of previous)
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 
 #include <minix/endpoint.h>
 

kernel/system/do_setgrant.c

@@ -6,7 +6,7 @@
  *	SG_SIZE	number of entries
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 #include <minix/safecopies.h>
 
 /*===========================================================================*

kernel/system/do_sigreturn.c

@@ -7,7 +7,7 @@
  *
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 #include <string.h>
 #include <machine/cpu.h>
 #include <sys/sigcontext.h>

kernel/system/do_sigsend.c

@@ -8,7 +8,7 @@
  *
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 #include <signal.h>
 #include <string.h>
 #include <sys/sigcontext.h>

kernel/system/do_sprofile.c

@@ -13,7 +13,7 @@
  *   14 Aug, 2006   Created (Rogier Meurs)
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 
 #if SPROFILE
 

kernel/system/do_stime.c

@@ -5,7 +5,7 @@
  *    m4_l3:	T_BOOTTIME
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 
 #include <minix/endpoint.h>
 

kernel/system/do_sysctl.c

@@ -6,7 +6,7 @@
  * and then request-specific arguments in SYSCTL_ARG1 and SYSCTL_ARG2.
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 
 
 /*===========================================================================*

kernel/system/do_times.c

@@ -9,7 +9,7 @@
  *    m4_l5:	T_BOOT_TICKS	
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 
 #include <minix/endpoint.h>
 

kernel/system/do_trace.c

@@ -8,7 +8,7 @@
  *    m2_l2:    CTL_DATA        data to be written or returned here
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 #include <sys/ptrace.h>
 
 #if USE_TRACE

kernel/system/do_umap.c

@@ -9,7 +9,7 @@
  *    m5_l3:	CP_NR_BYTES	(size of datastructure) 	
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 
 #include <minix/endpoint.h>
 

kernel/system/do_unused.c

@@ -2,7 +2,7 @@
  * call may be unused when it is not defined or when it is disabled in the
  * kernel's configuration.
  */
-#include "../system.h"
+#include "kernel/system.h"
 
 /*===========================================================================*
  *			          do_unused				     *

kernel/system/do_update.c

@@ -6,8 +6,8 @@
  *    m2_i2:	SYS_UPD_DST_ENDPT	(destination process endpoint)
  */
 
-#include "../system.h"
-#include "../ipc.h"
+#include "kernel/system.h"
+#include "kernel/ipc.h"
 #include <string.h>
 
 #if USE_UPDATE

kernel/system/do_vdevio.c

@@ -7,7 +7,7 @@
  *    m2_i2:	DIO_VEC_SIZE	(number of ports to read or write) 
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 #include <minix/devio.h>
 #include <minix/endpoint.h>
 #include <minix/portio.h>

kernel/system/do_vmctl.c

@@ -7,9 +7,9 @@
  *    	SVMCTL_VALUE	to this value
  */
 
-#include "../system.h"
-#include "../vm.h"
-#include "../debug.h"
+#include "kernel/system.h"
+#include "kernel/vm.h"
+#include "kernel/debug.h"
 #include <assert.h>
 #include <minix/type.h>
 

kernel/system/do_vtimer.c

@@ -8,7 +8,7 @@
  *    m2_l2:	VT_ENDPT		(process to which the timer belongs)
  */
 
-#include "../system.h"
+#include "kernel/system.h"
 
 #include <signal.h>
 #include <minix/endpoint.h>