Module Name: src
Committed By: christos
Date: Sun Mar 10 21:41:06 UTC 2013
Modified Files:
src/lib/npf: Makefile
src/lib/npf/ext_log: Makefile
src/lib/npf/ext_rndblock: Makefile
Added Files:
src/lib/npf: mod.mk
src/lib/npf/ext_normalize: Makefile shlib_version
Removed Files:
src/lib/npf: Makefile.inc
src/lib/npf/ext_normalise: Makefile npfext_normalise.c shlib_version
Log Message:
- rename ext_normalise to ext_normalize
- move modules to from /usr/lib to /lib
- centralize make rules
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/npf/Makefile
cvs rdiff -u -r1.1 -r0 src/lib/npf/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/lib/npf/mod.mk
cvs rdiff -u -r1.2 -r1.3 src/lib/npf/ext_log/Makefile
cvs rdiff -u -r1.2 -r0 src/lib/npf/ext_normalise/Makefile
cvs rdiff -u -r1.1 -r0 src/lib/npf/ext_normalise/npfext_normalise.c \
src/lib/npf/ext_normalise/shlib_version
cvs rdiff -u -r0 -r1.1 src/lib/npf/ext_normalize/Makefile \
src/lib/npf/ext_normalize/shlib_version
cvs rdiff -u -r1.1 -r1.2 src/lib/npf/ext_rndblock/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/npf/Makefile
diff -u src/lib/npf/Makefile:1.2 src/lib/npf/Makefile:1.3
--- src/lib/npf/Makefile:1.2 Sun Dec 9 19:32:24 2012
+++ src/lib/npf/Makefile Sun Mar 10 17:41:05 2013
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2012/12/10 00:32:24 rmind Exp $
+# $NetBSD: Makefile,v 1.3 2013/03/10 21:41:05 christos Exp $
.include <bsd.own.mk>
.if ${MKPIC} != "no"
-SUBDIR= ext_log ext_normalise ext_rndblock
+SUBDIR= ext_log ext_normalize ext_rndblock
.endif
Index: src/lib/npf/ext_log/Makefile
diff -u src/lib/npf/ext_log/Makefile:1.2 src/lib/npf/ext_log/Makefile:1.3
--- src/lib/npf/ext_log/Makefile:1.2 Sun Dec 9 17:06:21 2012
+++ src/lib/npf/ext_log/Makefile Sun Mar 10 17:41:06 2013
@@ -1,21 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/12/09 22:06:21 spz Exp $
+# $NetBSD: Makefile,v 1.3 2013/03/10 21:41:06 christos Exp $
-.include <bsd.own.mk>
-
-LIBISMODULE= yes
-.if defined(MLIBDIR)
-LIBDIR= /usr/lib/${MLIBDIR}/npf
-SHLIBDIR= /usr/lib/${MLIBDIR}/npf
-SHLIBINSTALLDIR=/usr/lib/${MLIBDIR}/npf
-.else
-LIBDIR= /usr/lib/npf
-SHLIBDIR= /usr/lib/npf
-SHLIBINSTALLDIR=/usr/lib/npf
-.endif
-
-LIB= ext_log
-
-SRCS= npfext_log.c
-WARNS= 5
-
-.include <bsd.lib.mk>
+MOD= ext_log
+.include "${.CURDIR}/../mod.mk"
Index: src/lib/npf/ext_rndblock/Makefile
diff -u src/lib/npf/ext_rndblock/Makefile:1.1 src/lib/npf/ext_rndblock/Makefile:1.2
--- src/lib/npf/ext_rndblock/Makefile:1.1 Sun Dec 9 19:32:24 2012
+++ src/lib/npf/ext_rndblock/Makefile Sun Mar 10 17:41:06 2013
@@ -1,21 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/12/10 00:32:24 rmind Exp $
+# $NetBSD: Makefile,v 1.2 2013/03/10 21:41:06 christos Exp $
-.include <bsd.own.mk>
-
-LIBISMODULE= yes
-.if defined(MLIBDIR)
-LIBDIR= /usr/lib/${MLIBDIR}/npf
-SHLIBDIR= /usr/lib/${MLIBDIR}/npf
-SHLIBINSTALLDIR=/usr/lib/${MLIBDIR}/npf
-.else
-LIBDIR= /usr/lib/npf
-SHLIBDIR= /usr/lib/npf
-SHLIBINSTALLDIR=/usr/lib/npf
-.endif
-
-LIB= ext_rndblock
-
-SRCS= npfext_rndblock.c
-WARNS= 5
-
-.include <bsd.lib.mk>
+MOD= ext_rndblock
+.include "${.CURDIR}/../mod.mk"
Added files:
Index: src/lib/npf/mod.mk
diff -u /dev/null src/lib/npf/mod.mk:1.1
--- /dev/null Sun Mar 10 17:41:06 2013
+++ src/lib/npf/mod.mk Sun Mar 10 17:41:05 2013
@@ -0,0 +1,25 @@
+# $NetBSD: mod.mk,v 1.1 2013/03/10 21:41:05 christos Exp $
+
+WARNS= 5
+MKLINT= no
+LIBISMODULE= yes
+LIBROOTDIR=/lib
+
+.if exists(${.CURDIR}/../../Makefile.inc)
+.include "${.CURDIR}/../../Makefile.inc"
+.endif
+
+.if defined(MLIBDIR)
+LIBDIR= ${LIBROOTDIR}/${MLIBDIR}/npf
+SHLIBDIR= ${LIBROOTDIR}/${MLIBDIR}/npf
+SHLIBINSTALLDIR=${LIBROOTDIR}/${MLIBDIR}/npf
+.else
+LIBDIR= ${LIBROOTDIR}/npf
+SHLIBDIR= ${LIBROOTDIR}/npf
+SHLIBINSTALLDIR=${LIBROOTDIR}/npf
+.endif
+
+LIB=${MOD}
+SRCS=npf${MOD}.c
+
+.include <bsd.lib.mk>
Index: src/lib/npf/ext_normalize/Makefile
diff -u /dev/null src/lib/npf/ext_normalize/Makefile:1.1
--- /dev/null Sun Mar 10 17:41:06 2013
+++ src/lib/npf/ext_normalize/Makefile Sun Mar 10 17:41:06 2013
@@ -0,0 +1,4 @@
+# $NetBSD: Makefile,v 1.1 2013/03/10 21:41:06 christos Exp $
+
+MOD= ext_normalize
+.include "${.CURDIR}/../mod.mk"
Index: src/lib/npf/ext_normalize/shlib_version
diff -u /dev/null src/lib/npf/ext_normalize/shlib_version:1.1
--- /dev/null Sun Mar 10 17:41:06 2013
+++ src/lib/npf/ext_normalize/shlib_version Sun Mar 10 17:41:06 2013
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2013/03/10 21:41:06 christos Exp $
+
+major=0
+minor=0
