PERFORCE change 77735 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=77735

Change 77735 by rwatson at rwatson_paprika on 2005/05/30 20:43:48

	Revised libbsm build Makefile to use OpenBSM tree.  It would be
	desirable to .include the Makefile from OpenBSM, but we're not
	quite there yet.

Affected files ...

.. //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#7 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#7 (text+ko) ====

@@ -2,28 +2,121 @@
 # $FreeBSD$
 #
 
-BSMDIR=		${.CURDIR}/../../contrib/bsm
-BSMMANDIR=	${.CURDIR}/../../contrib/bsm/man
+OPENBSMDIR=		${.CURDIR}/../../contrib/openbsm
 
 LIB=		bsm
 SHLIB_MAJOR=	1
 
-.PATH:		${BSMDIR}/lib
-SRCS=		bsm_audit.c bsm_class.c bsm_control.c bsm_event.c \
-		    bsm_flags.c bsm_io.c bsm_mask.c \
-		    bsm_token.c bsm_user.c lib_wrappers.c
+.PATH:		${OPENBSMDIR}/libbsm
+
+SRCS=	bsm_audit.c							\
+	bsm_class.c							\
+	bsm_control.c							\
+	bsm_event.c							\
+	bsm_flags.c							\
+	bsm_io.c							\
+	bsm_mask.c							\
+	bsm_notify.c							\
+	bsm_token.c							\
+	bsm_user.c							\
+	bsm_wrappers.c
 
 #
 # Must use BSM include files from within the contrib area, not the system.
 #
-CFLAGS+=	-I${BSMDIR}/lib -I${.CURDIR}/../../sys
+CFLAGS+=	-I${OPENBSMDIR} ${.PATH}-I ${.CURDIR}/../../sys
+
+INCS=	libbsm.h
 
-INCS=		audit_uevents.h libbsm.h
-INCSDIR=	${INCLUDEDIR}/bsm
+MAN=	libbsm.3							\
+	au_class.3							\
+	au_control.3							\
+	au_event.3							\
+	au_free_token.3							\
+	au_io.3								\
+	au_mask.3							\
+	au_token.3							\
+	au_user.3
 
-MAN=	${BSMMANDIR}/audit_class.5 ${BSMMANDIR}/audit_control.5 \
-	${BSMMANDIR}/audit_event.5 ${BSMMANDIR}/audit_user.5 \
-	${BSMMANDIR}/audit_warn.5 ${BSMMANDIR}/auditreduce.1 \
-	${BSMMANDIR}/praudit.1
+MLINKS=	libbsm.3 bsm.3							\
+	au_class.3 free_au_class_ent.3					\
+	au_class.3 getauclassent.3					\
+	au_class.3 getauclassnam.3					\
+	au_class.3 setauclass.3						\
+	au_class.3 endauclass.3						\
+	au_control.3 setac.3						\
+	au_control.3 endac.3						\
+	au_control.3 getacdir.3						\
+	au_control.3 getacmin.3						\
+	au_control.3 getacflg.3						\
+	au_control.3 getacna.3						\
+	au_event.3 free_au_event_ent.3					\
+	au_event.3 setauevent.3						\
+	au_event.3 endauevent.3						\
+	au_event.3 getauevent.3						\
+	au_event.3 getauevnam.3						\
+	au_event.3 getauevnum.3						\
+	au_event.3 getauevnonam.3					\
+	au_event.3 free_au_event.3					\
+	au_io.3	au_fetch_tok.3						\
+	au_io.3	au_print_tok.3						\
+	au_io.3	au_read_rec.3						\
+	au_mask.3 au_preselect.3					\
+	au_mask.3 getauditflagsbin.3					\
+	au_mask.3 getauditflagschar.3					\
+	au_user.3 free_au_user_ent.3					\
+	au_user.3 setauuser.3						\
+	au_user.3 endauuser.3						\
+	au_user.3 getauuserent.3					\
+	au_user.3 getauusernam.3					\
+	au_user.3 au_user_mask.3					\
+	au_user.3 getfauditflags.3					\
+	au_token.3 au_to_arg32.3					\
+	au_token.3 au_to_arg64.3					\
+	au_token.3 au_to_arg.3						\
+	au_token.3 au_to_attr64.3					\
+	au_token.3 au_to_data.3						\
+	au_token.3 au_to_exit.3						\
+	au_token.3 au_to_groups.3					\
+	au_token.3 au_to_newgroups.3					\
+	au_token.3 au_to_in_addr.3					\
+	au_token.3 au_to_in_addr_ex.3					\
+	au_token.3 au_to_ip.3						\
+	au_token.3 au_to_ipc.3						\
+	au_token.3 au_to_ipc_perm.3					\
+	au_token.3 au_to_iport.3					\
+	au_token.3 au_to_opaque.3					\
+	au_token.3 au_to_file.3						\
+	au_token.3 au_to_text.3						\
+	au_token.3 au_to_path.3						\
+	au_token.3 au_to_process32.3					\
+	au_token.3 au_to_process64.3					\
+	au_token.3 au_to_process.3					\
+	au_token.3 au_to_process32_ex.3					\
+	au_token.3 au_to_process64_ex.3					\
+	au_token.3 au_to_process_ex.3					\
+	au_token.3 au_to_return32.3					\
+	au_token.3 au_to_return64.3					\
+	au_token.3 au_to_return.3					\
+	au_token.3 au_to_seq.3						\
+	au_token.3 au_to_socket.3					\
+	au_token.3 au_to_socket_ex_32.3					\
+	au_token.3 au_to_socket_ex_128.3				\
+	au_token.3 au_to_sock_inet32.3					\
+	au_token.3 au_to_sock_inet128.3					\
+	au_token.3 au_to_sock_inet.3					\
+	au_token.3 au_to_subject32.3					\
+	au_token.3 au_to_subject64.3					\
+	au_token.3 au_to_subject.3					\
+	au_token.3 au_to_subject32_ex.3					\
+	au_token.3 au_to_subject64_ex.3					\
+	au_token.3 au_to_subject_ex.3					\
+	au_token.3 au_to_me.3						\
+	au_token.3 au_to_exec_args.3					\
+	au_token.3 au_to_exec_env.3					\
+	au_token.3 au_to_header.3					\
+	au_token.3 au_to_header32.3					\
+	au_token.3 au_to_header64.3					\
+	au_token.3 au_to_trailer.3
 
 .include <bsd.lib.mk>
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message