13 files changed, 79 insertions, 30 deletions

diff --git a/sys/modules/libalias/Makefile b/sys/modules/libalias/Makefile
index 6a2255e5de48..c8b7dd58e774 100644
--- a/sys/modules/libalias/Makefile
+++ b/sys/modules/libalias/Makefile
@@ -1,33 +1,5 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../netinet/libalias
+SUBDIR=        libalias modules
 
-KMOD=	libalias
-SRCS=	alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \
-	alias_nbt.c alias_pptp.c alias_proxy.c alias_skinny.c alias_smedia.c \
-	alias_util.c
-INCS=	alias.h
-
-EXPORT_SYMS=	LibAliasInit \
-		LibAliasUninit \
-		LibAliasSetAddress \
-		LibAliasSetMode \
-		LibAliasSkinnyPort \
-		LibAliasIn \
-		LibAliasOut \
-		LibAliasRedirectPort \
-		LibAliasRedirectAddr \
-		LibAliasAddServer \
-		LibAliasRedirectDynamic \
-		LibAliasRedirectDelete \
-		LibAliasProxyRule \
-		LibAliasRedirectProto \
-		LibAliasSaveFragment \
-		LibAliasGetFragment \
-		LibAliasFragmentIn \
-		LibAliasSetTarget \
-		LibAliasCheckNewLink \
-		LibAliasInternetChecksum \
-		LibAliasUnaliasOut
-
-.include <bsd.kmod.mk>
+.include <bsd.subdir.mk>
diff --git a/sys/modules/libalias/libalias/Makefile b/sys/modules/libalias/libalias/Makefile
new file mode 100644
index 000000000000..f5b480c72cab
--- /dev/null
+++ b/sys/modules/libalias/libalias/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../netinet/libalias
+
+KMOD=	libalias
+SRCS=	alias.c alias_db.c alias_proxy.c alias_util.c alias_old.c alias_mod.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/libalias/modules/Makefile b/sys/modules/libalias/modules/Makefile
new file mode 100644
index 000000000000..828e40faae78
--- /dev/null
+++ b/sys/modules/libalias/modules/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+.include "modules.inc"
+
+SUBDIR= ${MODULES}
+
+.include <bsd.subdir.mk>
diff --git a/sys/modules/libalias/modules/Makefile.inc b/sys/modules/libalias/modules/Makefile.inc
new file mode 100644
index 000000000000..78391c597b86
--- /dev/null
+++ b/sys/modules/libalias/modules/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../../netinet/libalias
diff --git a/sys/modules/libalias/modules/cuseeme/Makefile b/sys/modules/libalias/modules/cuseeme/Makefile
new file mode 100644
index 000000000000..dfb5a83d2790
--- /dev/null
+++ b/sys/modules/libalias/modules/cuseeme/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+KMOD=	alias_cuseeme
+SRCS=	alias_cuseeme.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/libalias/modules/dummy/Makefile b/sys/modules/libalias/modules/dummy/Makefile
new file mode 100644
index 000000000000..ded455a8dfe7
--- /dev/null
+++ b/sys/modules/libalias/modules/dummy/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+KMOD=	alias_dummy
+SRCS=	alias_dummy.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/libalias/modules/ftp/Makefile b/sys/modules/libalias/modules/ftp/Makefile
new file mode 100644
index 000000000000..07e700b40956
--- /dev/null
+++ b/sys/modules/libalias/modules/ftp/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+KMOD=	alias_ftp
+SRCS=	alias_ftp.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/libalias/modules/irc/Makefile b/sys/modules/libalias/modules/irc/Makefile
new file mode 100644
index 000000000000..b6e330d9e1b8
--- /dev/null
+++ b/sys/modules/libalias/modules/irc/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+KMOD=	alias_irc
+SRCS=	alias_irc.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/libalias/modules/modules.inc b/sys/modules/libalias/modules/modules.inc
new file mode 100644
index 000000000000..9582ab53828c
--- /dev/null
+++ b/sys/modules/libalias/modules/modules.inc
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+MODULES		 =
+MODULES		+= cuseeme
+MODULES		+= dummy
+MODULES		+= ftp
+MODULES		+= irc
+MODULES		+= nbt
+MODULES		+= pptp
+MODULES		+= skinny
+MODULES		+= smedia
diff --git a/sys/modules/libalias/modules/nbt/Makefile b/sys/modules/libalias/modules/nbt/Makefile
new file mode 100644
index 000000000000..6d6dd8728b6a
--- /dev/null
+++ b/sys/modules/libalias/modules/nbt/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+KMOD=	alias_nbt
+SRCS=	alias_nbt.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/libalias/modules/pptp/Makefile b/sys/modules/libalias/modules/pptp/Makefile
new file mode 100644
index 000000000000..748f356e9fa7
--- /dev/null
+++ b/sys/modules/libalias/modules/pptp/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+KMOD=	alias_pptp
+SRCS=	alias_pptp.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/libalias/modules/skinny/Makefile b/sys/modules/libalias/modules/skinny/Makefile
new file mode 100644
index 000000000000..8560f5ed131f
--- /dev/null
+++ b/sys/modules/libalias/modules/skinny/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+KMOD=	alias_skinny
+SRCS=	alias_skinny.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/libalias/modules/smedia/Makefile b/sys/modules/libalias/modules/smedia/Makefile
new file mode 100644
index 000000000000..245a63e8cfec
--- /dev/null
+++ b/sys/modules/libalias/modules/smedia/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+KMOD=	alias_smedia
+SRCS=	alias_smedia.c
+
+.include <bsd.kmod.mk>