summaryrefslogtreecommitdiff
path: root/sys/modules
diff options
context:
space:
mode:
authorpgoyette <pgoyette@NetBSD.org>2015-12-03 02:51:00 +0000
committerpgoyette <pgoyette@NetBSD.org>2015-12-03 02:51:00 +0000
commitef6316ef4aa8197ab4bd91b43e02430ea509199c (patch)
treef0447bbc45d9577152f6bceddc8e2305a71229e3 /sys/modules
parentfdf45d0220d54456dd25d451d64c4459dbb125eb (diff)
Merge the compat_sysv module into the sysv_ipc module - it should
never have been a separate module in the first place (my bad). Adjust dependencies as appropriate.
Diffstat (limited to 'sys/modules')
-rw-r--r--sys/modules/Makefile3
-rw-r--r--sys/modules/compat_sysv/Makefile23
-rw-r--r--sys/modules/sysv_ipc/Makefile18
3 files changed, 17 insertions, 27 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 3708426a163..01a78d10fcc 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.160 2015/12/02 00:07:35 pgoyette Exp $
+# $NetBSD: Makefile,v 1.161 2015/12/03 02:51:01 pgoyette Exp $
.include <bsd.own.mk>
@@ -20,7 +20,6 @@ SUBDIR+= crypto
SUBDIR+= coda
SUBDIR+= coda5
SUBDIR+= compat
-SUBDIR+= compat_sysv
SUBDIR+= compat_ossaudio
SUBDIR+= coredump
SUBDIR+= dbcool
diff --git a/sys/modules/compat_sysv/Makefile b/sys/modules/compat_sysv/Makefile
deleted file mode 100644
index a7edde1297f..00000000000
--- a/sys/modules/compat_sysv/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2015/06/13 22:18:04 christos Exp $
-
-.include "../Makefile.inc"
-
-.PATH: ${S}/compat/common
-
-KMOD= compat_sysv
-
-CPPFLAGS+= -DCOMPAT_10
-CPPFLAGS+= -DCOMPAT_13
-CPPFLAGS+= -DCOMPAT_14
-CPPFLAGS+= -DCOMPAT_50
-CPPFLAGS+= -DSYSVSEM -DSYSVSHM -DSYSVMSG
-
-SRCS= compat_sysv_mod.c
-SRCS+= sysv_msg_14.c sysv_sem_14.c sysv_shm_14.c
-SRCS+= sysv_msg_50.c sysv_sem_50.c sysv_shm_50.c sysv_ipc_50.c
-
-.if ${MACHINE_ARCH} != "alpha"
-SRCS+= kern_ipc_10.c
-.endif
-
-.include <bsd.kmodule.mk>
diff --git a/sys/modules/sysv_ipc/Makefile b/sys/modules/sysv_ipc/Makefile
index 1133fed6ebb..c54b0cec135 100644
--- a/sys/modules/sysv_ipc/Makefile
+++ b/sys/modules/sysv_ipc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/05/13 02:06:25 pgoyette Exp $
+# $NetBSD: Makefile,v 1.2 2015/12/03 02:51:01 pgoyette Exp $
.include "../Makefile.inc"
@@ -8,6 +8,20 @@ KMOD= sysv_ipc
CPPFLAGS+= -DSYSVSEM -DSYSVSHM -DSYSVMSG
-SRCS= sysv_ipc.c sysv_msg.c sysv_sem.c sysv_shm.c
+SRCS+= sysv_ipc.c sysv_msg.c sysv_sem.c sysv_shm.c
+
+.PATH: ${S}/compat/common
+
+CPPFLAGS+= -DCOMPAT_10
+CPPFLAGS+= -DCOMPAT_13
+CPPFLAGS+= -DCOMPAT_14
+CPPFLAGS+= -DCOMPAT_50
+
+SRCS+= sysv_msg_14.c sysv_sem_14.c sysv_shm_14.c
+SRCS+= sysv_msg_50.c sysv_sem_50.c sysv_shm_50.c sysv_ipc_50.c
+
+.if ${MACHINE_ARCH} != "alpha"
+SRCS+= kern_ipc_10.c
+.endif
.include <bsd.kmodule.mk>