summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/libgssapi/Makefile15
-rw-r--r--lib/libkadm5srv/Makefile24
-rw-r--r--lib/libkrb5/Makefile61
-rw-r--r--lib/libkrb5/Makefile.asn1.inc7
-rw-r--r--lib/libkrb5/Makefile.common.inc8
-rw-r--r--lib/libkrb5/Makefile.hdb.inc7
-rw-r--r--lib/libkrb5/Makefile.kafs.inc5
-rw-r--r--lib/libkrb5/Makefile.krb5.inc10
8 files changed, 105 insertions, 32 deletions
diff --git a/lib/libgssapi/Makefile b/lib/libgssapi/Makefile
index 793cb3e029e..dd0d27818ef 100644
--- a/lib/libgssapi/Makefile
+++ b/lib/libgssapi/Makefile
@@ -1,11 +1,22 @@
-# $OpenBSD: Makefile,v 1.2 2003/05/16 19:01:19 hin Exp $
+# $OpenBSD: Makefile,v 1.3 2003/05/17 05:20:18 mho Exp $
KRB5DIR = ${.CURDIR}/../../kerberosV
.include <${.CURDIR}/../libkrb5/Makefile.common.inc>
LIB= gssapi
-INCLUDE_FILES= ${KRB5SRC}/lib/gssapi/gssapi.h
+DIR_GSSAPI= ${KRB5SRC}/lib/gssapi
+HDR_GSSAPI= gssapi.h
+
+includes:
+ @echo -n ${DIR_GSSAPI}:; \
+ cd ${DIR_GSSAPI}; for i in ${HDR_GSSAPI}; do \
+ echo -n " $$i"; \
+ cmp -s $$i ${DESTDIR}/usr/include/kerberosV/$$i || \
+ ${INSTALL} ${INSTALL_COPY} -m 444 \
+ -o ${BINOWN} -g $(BINGRP) $$i \
+ ${DESTDIR}/usr/include/kerberosV; done; \
+ echo
SRCS= 8003.c \
accept_sec_context.c \
diff --git a/lib/libkadm5srv/Makefile b/lib/libkadm5srv/Makefile
index 5909f9f5874..25f9ff1c04a 100644
--- a/lib/libkadm5srv/Makefile
+++ b/lib/libkadm5srv/Makefile
@@ -1,14 +1,32 @@
-# $OpenBSD: Makefile,v 1.1 2003/05/14 23:48:20 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2003/05/17 05:20:18 mho Exp $
KRB5DIR = ${.CURDIR}/../../kerberosV
.include <${.CURDIR}/../libkrb5/Makefile.common.inc>
LIB= kadm5srv
-INCLUDE_DIR= ${DESTDIR}/usr/include/kerberosV/kadm5
-INCLUDE_FILES= ${KRB5SRC}/lib/kadm5/{admin.h,private.h} kadm5_err.h
+DIR_KADM5SRV= ${KRB5SRC}/lib/kadm5
+HDR_KADM5SRV= admin.h kadm5-private.h kadm5-protos.h private.h
+HDR_OBJ= kadm5_err.h
includes: kadm5_err.h
+ @test -d ${DESTDIR}/usr/include/kerberosV/kadm5 || \
+ mkdir ${DESTDIR}/usr/include/kerberosV/kadm5
+ @echo -n ${DIR_KADM5SRV}:; \
+ cd ${DIR_KADM5SRV}; for i in ${HDR_KADM5SRV}; do \
+ echo -n " $$i"; \
+ cmp -s $$i ${DESTDIR}/usr/include/kerberosV/kadm5/$$i || \
+ ${INSTALL} ${INSTALL_COPY} -m 444 \
+ -o ${BINOWN} -g $(BINGRP) $$i \
+ ${DESTDIR}/usr/include/kerberosV/kadm5; done; \
+ echo
+ @echo -n ${.OBJDIR}:; \
+ cd ${.OBJDIR}; for i in ${HDR_OBJ}; do \
+ echo -n " $$i"; \
+ cmp -s $$i ${DESTDIR}/usr/include/kerberosV/kadm5/$$i || \
+ ${INSTALL} ${INSTALL_COPY} -m 444 \
+ -o ${BINOWN} -g $(BINGRP) $$i \
+ ${DESTDIR}/usr/include/kerberosV/kadm5; done
SRCS= acl.c \
admin.h \
diff --git a/lib/libkrb5/Makefile b/lib/libkrb5/Makefile
index cad2e152a9d..0ee365dd102 100644
--- a/lib/libkrb5/Makefile
+++ b/lib/libkrb5/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2003/05/17 02:03:19 hin Exp $
+# $OpenBSD: Makefile,v 1.6 2003/05/17 05:20:18 mho Exp $
KRB5DIR= ${.CURDIR}/../../kerberosV
.include "Makefile.common.inc"
@@ -14,14 +14,57 @@ LIB = krb5
.include "Makefile.krb5.inc"
includes:
- @for i in $(INCLUDE_FILES); do \
- j="cmp -s $$i ${DESTDIR}/usr/include/kerberosV/$$i || \
- ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
- $$i ${DESTDIR}/usr/include/kerberosV"; \
- echo $$j; \
- pwd; \
- eval "$$j"; \
- done
+ @test -d ${DESTDIR}/usr/include/kerberosV || \
+ mkdir ${DESTDIR}/usr/include/kerberosV
+ @echo -n ${DIR_KRB5INC}:; \
+ cd ${DIR_KRB5INC}; for i in ${HDR_KRB5INC}; do \
+ echo -n " $$i"; \
+ cmp -s $$i ${DESTDIR}/usr/include/kerberosV/$$i || \
+ ${INSTALL} ${INSTALL_COPY} -m 444 \
+ -o ${BINOWN} -g $(BINGRP) $$i \
+ ${DESTDIR}/usr/include/kerberosV; done; \
+ echo
+ @echo -n ${DIR_KRB5LIB}:; \
+ cd ${DIR_KRB5LIB}; for i in ${HDR_KRB5LIB}; do \
+ echo -n " $$i"; \
+ cmp -s $$i ${DESTDIR}/usr/include/kerberosV/$$i || \
+ ${INSTALL} ${INSTALL_COPY} -m 444 \
+ -o ${BINOWN} -g $(BINGRP) $$i \
+ ${DESTDIR}/usr/include/kerberosV; done; \
+ echo
+ @echo -n ${DIRKAFS}:; \
+ cd ${DIR_KAFS}; for i in ${HDR_KAFS}; do \
+ echo -n " $$i"; \
+ cmp -s $$i ${DESTDIR}/usr/include/kerberosV/$$i || \
+ ${INSTALL} ${INSTALL_COPY} -m 444 \
+ -o ${BINOWN} -g $(BINGRP) $$i \
+ ${DESTDIR}/usr/include/kerberosV; done; \
+ echo
+ @echo -n ${DIR_HDB}:; \
+ cd ${DIR_HDB}; for i in ${HDR_HDB}; do \
+ echo -n " $$i"; \
+ cmp -s $$i ${DESTDIR}/usr/include/kerberosV/$$i || \
+ ${INSTALL} ${INSTALL_COPY} -m 444 \
+ -o ${BINOWN} -g $(BINGRP) $$i \
+ ${DESTDIR}/usr/include/kerberosV; done; \
+ echo
+ @echo -n ${DIR_ASN1}:; \
+ cd ${DIR_ASN1}; for i in ${HDR_ASN1}; do \
+ echo -n " $$i"; \
+ cmp -s $$i ${DESTDIR}/usr/include/kerberosV/$$i || \
+ ${INSTALL} ${INSTALL_COPY} -m 444 \
+ -o ${BINOWN} -g $(BINGRP) $$i \
+ ${DESTDIR}/usr/include/kerberosV; done; \
+ echo
+ @echo -n ${.OBJDIR}:; \
+ cd ${.OBJDIR}; for i in ${HDR_OBJ}; do \
+ echo -n " $$i"; \
+ cmp -s $$i ${DESTDIR}/usr/include/kerberosV/$$i || \
+ ${INSTALL} ${INSTALL_COPY} -m 444 \
+ -o ${BINOWN} -g $(BINGRP) $$i \
+ ${DESTDIR}/usr/include/kerberosV; done; \
+ echo
+
SHLIB_LINKS = kafs asn1
ALIB_LINKS = $(SHLIB_LINKS) hdb
diff --git a/lib/libkrb5/Makefile.asn1.inc b/lib/libkrb5/Makefile.asn1.inc
index 8fd7c36aaa0..d7492c07289 100644
--- a/lib/libkrb5/Makefile.asn1.inc
+++ b/lib/libkrb5/Makefile.asn1.inc
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile.asn1.inc,v 1.1 2003/05/14 09:05:59 hin Exp $
+# $OpenBSD: Makefile.asn1.inc,v 1.2 2003/05/17 05:20:18 mho Exp $
.PATH: ${KRB5SRC}/lib/asn1
-INCLUDE_FILES+= krb5_asn1.h asn1_err.h \
- ${KRB5SRC}/lib/asn1/{der.h,asn1-common.h}
+DIR_ASN1= ${KRB5SRC}/lib/asn1
+HDR_ASN1= der.h #asn1-common.h
+HDR_OBJ+= krb5_asn1.h asn1_err.h
includes: krb5_asn1.h asn1_err.h
diff --git a/lib/libkrb5/Makefile.common.inc b/lib/libkrb5/Makefile.common.inc
index 06e5f5c1fdd..7fb442e7150 100644
--- a/lib/libkrb5/Makefile.common.inc
+++ b/lib/libkrb5/Makefile.common.inc
@@ -1,16 +1,12 @@
-# $OpenBSD: Makefile.common.inc,v 1.1 2003/05/14 09:05:59 hin Exp $
+# $OpenBSD: Makefile.common.inc,v 1.2 2003/05/17 05:20:18 mho Exp $
KRB5SRC = ${KRB5DIR}/src
-KRB4DIR = ${KRB5DIR}/../kerberosIV
-KRB4SRC = ${KRB4DIR}/src
-
CFLAGS += -DHAVE_CONFIG_H -DBINDIR=\"/usr/bin\" -DSBINDIR=\"/usr/sbin\"\
-DLIBEXECDIR=\"/usr/libexec\" -DSYSCONFDIR=\"/etc/kerberosV\" \
-I${DESTDIR}/usr/include/kerberosV \
- -I${DESTDIR}/usr/include/kerberosIV \
-I${KRB5DIR}/include -I${KRB5SRC}/lib/roken\
- -I${KRB5SRC}/include -I${KRB4SRC}/lib/sl
+ -I${KRB5SRC}/include -I${KRB5SRC}/lib/sl
CFLAGS+= -Wall
.include <bsd.own.mk> # for 'NOPIC' definition
diff --git a/lib/libkrb5/Makefile.hdb.inc b/lib/libkrb5/Makefile.hdb.inc
index 5b97c4660f5..32fc292315e 100644
--- a/lib/libkrb5/Makefile.hdb.inc
+++ b/lib/libkrb5/Makefile.hdb.inc
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile.hdb.inc,v 1.1 2003/05/14 09:05:59 hin Exp $
+# $OpenBSD: Makefile.hdb.inc,v 1.2 2003/05/17 05:20:18 mho Exp $
-INCLUDE_FILES+= ${KRB5SRC}/lib/hdb/{hdb.h,hdb-protos.h,hdb-private.h} \
- hdb_err.h ${.CURDIR}/hdb_asn1.h
+DIR_HDB= ${KRB5SRC}/lib/hdb
+HDR_HDB= hdb.h hdb-protos.h hdb-private.h
+HDR_OBJ+= hdb_err.h hdb_asn1.h
includes: hdb_err.h hdb_asn1.h
diff --git a/lib/libkrb5/Makefile.kafs.inc b/lib/libkrb5/Makefile.kafs.inc
index fca38a7acbd..0d32d3ba8e9 100644
--- a/lib/libkrb5/Makefile.kafs.inc
+++ b/lib/libkrb5/Makefile.kafs.inc
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile.kafs.inc,v 1.2 2003/05/15 04:16:10 hin Exp $
+# $OpenBSD: Makefile.kafs.inc,v 1.3 2003/05/17 05:20:18 mho Exp $
-INCLUDE_FILES+= ${KRB5SRC}/lib/kafs/kafs.h
+DIR_KAFS= ${KRB5SRC}/lib/kafs
+HDR_KAFS= kafs.h
CFLAGS += -I${KRB5SRC}/lib/kafs
diff --git a/lib/libkrb5/Makefile.krb5.inc b/lib/libkrb5/Makefile.krb5.inc
index fd66d1d2d8c..0d2baaf8f7b 100644
--- a/lib/libkrb5/Makefile.krb5.inc
+++ b/lib/libkrb5/Makefile.krb5.inc
@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile.krb5.inc,v 1.2 2003/05/15 04:16:10 hin Exp $
+# $OpenBSD: Makefile.krb5.inc,v 1.3 2003/05/17 05:20:18 mho Exp $
-INCLUDE_FILES+= ${KRB5SRC}/lib/krb5/{krb5.h,krb5-protos.h,krb5-private.h} \
- ${KRB5DIR}/include/krb5-types.h \
- krb5_err.h heim_err.h k524_err.h
+DIR_KRB5INC=${.CURDIR}/../../kerberosV/include
+DIR_KRB5LIB=${KRB5SRC}/lib/krb5
+HDR_KRB5INC= krb5-types.h
+HDR_KRB5LIB= krb5.h krb5-protos.h krb5-private.h
+HDR_OBJ+= krb5_err.h heim_err.h k524_err.h
includes: krb5_err.h heim_err.h k524_err.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 06:54:25 +0000