[Midnightbsd-cvs] src: Makefile: merge

[laffer1 at midnightbsd.org]

Log Message:
-----------
merge

Modified Files:
--------------
    src/sys/modules/crypto:
        Makefile (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sys/modules/crypto/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/modules/crypto/Makefile -L sys/modules/crypto/Makefile -u -r1.2 -r1.3
--- sys/modules/crypto/Makefile
+++ sys/modules/crypto/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/crypto/Makefile,v 1.3.2.1 2006/03/01 21:40:14 wkoszek Exp $
+# $FreeBSD: src/sys/modules/crypto/Makefile,v 1.6 2007/05/09 19:37:01 gnn Exp $
 
 .PATH:	${.CURDIR}/../../opencrypto
 .PATH:	${.CURDIR}/../../crypto
@@ -6,14 +6,16 @@
 .PATH:	${.CURDIR}/../../crypto/des
 .PATH:	${.CURDIR}/../../crypto/rijndael
 .PATH:	${.CURDIR}/../../crypto/sha2
+.PATH:	${.CURDIR}/../../crypto/camellia
 
 KMOD	= crypto
-SRCS	= crypto.c
+SRCS	= crypto.c cryptodev_if.c
 SRCS	+= criov.c cryptosoft.c xform.c
 SRCS	+= cast.c deflate.c rmd160.c rijndael-alg-fst.c rijndael-api.c
 SRCS	+= skipjack.c bf_enc.c bf_skey.c
 SRCS	+= des_ecb.c des_enc.c des_setkey.c
 SRCS	+= sha1.c sha2.c
-SRCS	+= opt_param.h
-
+SRCS	+= opt_param.h cryptodev_if.h bus_if.h device_if.h
+SRCS	+= opt_ddb.h
+SRCS	+= camellia.c camellia-api.c
 .include <bsd.kmod.mk>