summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Insulander <hin@cvs.openbsd.org>2001-06-05 10:38:37 +0000
committerHans Insulander <hin@cvs.openbsd.org>2001-06-05 10:38:37 +0000
commit67cc44ee0d61dd6df521e375a05b9937bede3c2e (patch)
treec5d4b9e63c6e521b0c86df778d93bb79b69e0481
parent3fd7bf777f1653e344752edbee81724645cba2c7 (diff)
Back out the make bug workaround that ho@ did.
-rw-r--r--kerberosV/lib/asn1/Makefile5
-rw-r--r--kerberosV/lib/hdb/Makefile5
-rw-r--r--kerberosV/lib/kadm5clnt/Makefile7
-rw-r--r--kerberosV/lib/kadm5srv/Makefile7
-rw-r--r--kerberosV/lib/krb5/Makefile10
5 files changed, 14 insertions, 20 deletions
diff --git a/kerberosV/lib/asn1/Makefile b/kerberosV/lib/asn1/Makefile
index 18611ecb956..5edc9092939 100644
--- a/kerberosV/lib/asn1/Makefile
+++ b/kerberosV/lib/asn1/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2001/05/25 12:38:15 ho Exp $
+# $OpenBSD: Makefile,v 1.3 2001/06/05 10:38:31 hin Exp $
LIB= asn1
KRBDEPTH=../..
.include <${.CURDIR}/../../Makefile.inc>
-INCLUDE_FILES= ${KRB5SRC}/lib/asn1/der.h ${KRB5SRC}/lib/asn1/asn1-common.h \
- asn1.h asn1_err.h
+INCLUDE_FILES= asn1.h asn1_err.h ${KRB5SRC}/lib/asn1/{der.h,asn1-common.h}
includes: asn1.h asn1_err.h
diff --git a/kerberosV/lib/hdb/Makefile b/kerberosV/lib/hdb/Makefile
index 397f1ec56d8..e2e8279a6a3 100644
--- a/kerberosV/lib/hdb/Makefile
+++ b/kerberosV/lib/hdb/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2001/05/25 12:38:16 ho Exp $
+# $OpenBSD: Makefile,v 1.3 2001/06/05 10:38:33 hin Exp $
KRBDEPTH=../..
.include <${.CURDIR}/../../Makefile.inc>
-INCLUDE_FILES= ${KRB5SRC}/lib/hdb/hdb.h ${KRB5SRC}/lib/hdb/hdb-protos.h \
- ${KRB5SRC}/lib/hdb/hdb-private.h \
+INCLUDE_FILES= ${KRB5SRC}/lib/hdb/{hdb.h,hdb-protos.h,hdb-private.h} \
hdb_err.h hdb_asn1.h
includes: hdb_err.h hdb_asn1.h
diff --git a/kerberosV/lib/kadm5clnt/Makefile b/kerberosV/lib/kadm5clnt/Makefile
index 60f2b6007ba..9da9457b88c 100644
--- a/kerberosV/lib/kadm5clnt/Makefile
+++ b/kerberosV/lib/kadm5clnt/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2001/05/25 12:38:16 ho Exp $
+# $OpenBSD: Makefile,v 1.3 2001/06/05 10:38:34 hin Exp $
LIB= kadm5clnt
KRBDEPTH=../..
.include <${.CURDIR}/../../Makefile.inc>
-INCLUDE_FILES= ${KRB5SRC}/lib/kadm5/admin.h ${KRB5SRC}/lib/kadm5/private.h \
- kadm5_err.h
+INCLUDE_FILES= ${KRB5SRC}/lib/kadm5/{admin.h,private.h} kadm5_err.h
includes: kadm5_err.h
@@ -41,4 +40,4 @@ CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/asn1 -I../asn1 -I../krb5 \
kadm5_err.c kadm5_err.h: ${KRB5SRC}/lib/kadm5/kadm5_err.et
compile_et ${KRB5SRC}/lib/kadm5/kadm5_err.et
-.include <bsd.lib.mk>
+.include <bsd.lib.mk> \ No newline at end of file
diff --git a/kerberosV/lib/kadm5srv/Makefile b/kerberosV/lib/kadm5srv/Makefile
index e09c7b25fb7..1104ab352df 100644
--- a/kerberosV/lib/kadm5srv/Makefile
+++ b/kerberosV/lib/kadm5srv/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2001/05/25 12:38:17 ho Exp $
+# $OpenBSD: Makefile,v 1.3 2001/06/05 10:38:35 hin Exp $
LIB= kadm5srv
@@ -6,8 +6,7 @@ KRBDEPTH=../..
.include <${.CURDIR}/../../Makefile.inc>
INCLUDE_DIR= ${DESTDIR}/usr/include/kerberosV/kadm5
-INCLUDE_FILES= ${KRB5SRC}/lib/kadm5/admin.h ${KRB5SRC}/lib/kadm5/private.h \
- kadm5_err.h
+INCLUDE_FILES= ${KRB5SRC}/lib/kadm5/{admin.h,private.h} kadm5_err.h
includes: kadm5_err.h
@@ -52,4 +51,4 @@ CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/asn1 -I../asn1 -I../krb5 \
kadm5_err.c kadm5_err.h: ${KRB5SRC}/lib/kadm5/kadm5_err.et
compile_et ${KRB5SRC}/lib/kadm5/kadm5_err.et
-.include <bsd.lib.mk>
+.include <bsd.lib.mk> \ No newline at end of file
diff --git a/kerberosV/lib/krb5/Makefile b/kerberosV/lib/krb5/Makefile
index 3aea7e30f6b..56051c3ec95 100644
--- a/kerberosV/lib/krb5/Makefile
+++ b/kerberosV/lib/krb5/Makefile
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.2 2001/05/25 12:38:17 ho Exp $
+# $OpenBSD: Makefile,v 1.3 2001/06/05 10:38:36 hin Exp $
KRBDEPTH=../..
.include <${.CURDIR}/../../Makefile.inc>
LIB= krb5
-INCLUDE_FILES= ${KRB5SRC}/lib/krb5/krb5.h ${KRB5SRC}/lib/krb5/krb5-protos.h \
- ${KRB5SRC}/lib/krb5/krb5-private.h \
- ${KRB5DIR}/include/krb5-types.h \
- krb5_err.h heim_err.h
+INCLUDE_FILES= ${KRB5SRC}/lib/krb5/{krb5.h,krb5-protos.h,krb5-private.h} \
+ ${KRB5DIR}/include/krb5-types.h krb5_err.h heim_err.h
includes: krb5_err.h heim_err.h
@@ -137,4 +135,4 @@ krb5_err.c krb5_err.h: ${KRB5SRC}/lib/krb5/krb5_err.et
heim_err.c heim_err.h: ${KRB5SRC}/lib/krb5/heim_err.et
compile_et ${KRB5SRC}/lib/krb5/heim_err.et
-.include <bsd.lib.mk>
+.include <bsd.lib.mk> \ No newline at end of file