diff options
| -rw-r--r-- | lib/libkrb5/Makefile.asn1.inc | 14 | ||||
| -rw-r--r-- | lib/libkrb5/Makefile.com_err.inc | 14 | ||||
| -rw-r--r-- | lib/libkrb5/Makefile.common.inc | 4 | ||||
| -rw-r--r-- | lib/libkrb5/Makefile.hdb.inc | 10 | ||||
| -rw-r--r-- | lib/libkrb5/Makefile.kafs.inc | 10 | ||||
| -rw-r--r-- | lib/libkrb5/Makefile.krb5.inc | 28 |
6 files changed, 38 insertions, 42 deletions
diff --git a/lib/libkrb5/Makefile.asn1.inc b/lib/libkrb5/Makefile.asn1.inc index 6b13819d8a9..99e6522fb46 100644 --- a/lib/libkrb5/Makefile.asn1.inc +++ b/lib/libkrb5/Makefile.asn1.inc @@ -1,12 +1,10 @@ -# $OpenBSD: Makefile.asn1.inc,v 1.4 2003/05/17 21:17:39 mho Exp $ - -.PATH: ${KRB5SRC}/lib/asn1 +# $OpenBSD: Makefile.asn1.inc,v 1.5 2003/06/23 14:39:14 mho Exp $ DIR_ASN1= ${KRB5SRC}/lib/asn1 -HDR_ASN1= der.h #asn1-common.h +HDR_ASN1= der.h asn1-common.h HDR_GEN+= krb5_asn1.h asn1_err.h -.PATH: ${KRB5SRC}/lib/asn1 +.PATH: ${DIR_ASN1} gen_files_asn1= \ krb5_asn1.h \ @@ -75,11 +73,11 @@ SRCS+= der_get.c \ ${gen_files_asn1} -CFLAGS+= -I${KRB5SRC}/lib/asn1 +CFLAGS+= -I${DIR_ASN1} regen_asn1: - cd ${GENDIR}; compile_et ${KRB5SRC}/lib/asn1/asn1_err.et - cd ${GENDIR}; asn1_compile ${KRB5SRC}/lib/asn1/k5.asn1 krb5_asn1; \ + cd ${GENDIR}; compile_et ${DIR_ASN1}/asn1_err.et + cd ${GENDIR}; asn1_compile ${DIR_ASN1}/k5.asn1 krb5_asn1; \ for f in *.x; do mv $$f `echo $$f | sed s,.x$$,.c,g`; done regen: regen_asn1 diff --git a/lib/libkrb5/Makefile.com_err.inc b/lib/libkrb5/Makefile.com_err.inc index 03cb446ed5a..c3ff26df642 100644 --- a/lib/libkrb5/Makefile.com_err.inc +++ b/lib/libkrb5/Makefile.com_err.inc @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile.com_err.inc,v 1.1 2003/06/03 09:12:25 hin Exp $ +# $OpenBSD: Makefile.com_err.inc,v 1.2 2003/06/23 14:39:14 mho Exp $ -CFLAGS += -I${KRB5SRC}/lib/com_err +DIR_COM_ERR= ${KRB5SRC}/lib/com_err +HDR_COM_ERR= com_err.h com_right.h -.PATH: ${KRB5SRC}/lib/com_err +.PATH: ${DIR_COM_ERR} -SRCS+= com_err.c error.c - -foo: - echo ${KRB5SRC}/lib/com_err +SRCS+= com_err.c \ + error.c +CFLAGS+= -I${DIR_COM_ERR} diff --git a/lib/libkrb5/Makefile.common.inc b/lib/libkrb5/Makefile.common.inc index 7fb442e7150..eb45980651e 100644 --- a/lib/libkrb5/Makefile.common.inc +++ b/lib/libkrb5/Makefile.common.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.common.inc,v 1.2 2003/05/17 05:20:18 mho Exp $ +# $OpenBSD: Makefile.common.inc,v 1.3 2003/06/23 14:39:14 mho Exp $ KRB5SRC = ${KRB5DIR}/src @@ -15,5 +15,3 @@ CFLAGS += -DHAVE_DLOPEN .endif .PATH: ${KRB5SRC}/man - -COM_ERR= -lcom_err_pic diff --git a/lib/libkrb5/Makefile.hdb.inc b/lib/libkrb5/Makefile.hdb.inc index e1c4f5193a2..bc6e14b9e6b 100644 --- a/lib/libkrb5/Makefile.hdb.inc +++ b/lib/libkrb5/Makefile.hdb.inc @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile.hdb.inc,v 1.4 2003/05/17 21:17:39 mho Exp $ +# $OpenBSD: Makefile.hdb.inc,v 1.5 2003/06/23 14:39:14 mho Exp $ DIR_HDB= ${KRB5SRC}/lib/hdb HDR_HDB= hdb.h hdb-protos.h hdb-private.h HDR_GEN+= hdb_err.h hdb_asn1.h -.PATH: ${KRB5SRC}/lib/hdb +.PATH: ${DIR_HDB} gen_files_hdb= \ hdb_asn1.h \ @@ -28,11 +28,11 @@ SRCS+= keytab.c \ print.c \ ${gen_files_hdb} -CFLAGS+= -I${KRB5SRC}/lib/hdb -I${KRB5SRC}/lib/asn1 +CFLAGS+= -I${DIR_HDB} #-I${DIR_ASN1} regen_hdb: - cd ${GENDIR}; compile_et ${KRB5SRC}/lib/hdb/hdb_err.et - cd ${GENDIR}; asn1_compile ${KRB5SRC}/lib/hdb/hdb.asn1 hdb_asn1; \ + cd ${GENDIR}; compile_et ${DIR_HDB}/hdb_err.et + cd ${GENDIR}; asn1_compile ${DIR_HDB}/hdb.asn1 hdb_asn1; \ for f in *.x; do mv $$f `echo $$f | sed s,.x$$,.c,g`; done regen: regen_hdb diff --git a/lib/libkrb5/Makefile.kafs.inc b/lib/libkrb5/Makefile.kafs.inc index 1bf0ac2a900..ec1177e089e 100644 --- a/lib/libkrb5/Makefile.kafs.inc +++ b/lib/libkrb5/Makefile.kafs.inc @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile.kafs.inc,v 1.4 2003/05/17 20:07:23 mho Exp $ +# $OpenBSD: Makefile.kafs.inc,v 1.5 2003/06/23 14:39:14 mho Exp $ DIR_KAFS= ${KRB5SRC}/lib/kafs HDR_KAFS= kafs.h -CFLAGS += -I${KRB5SRC}/lib/kafs +CFLAGS += -I${DIR_KAFS} -.PATH: ${KRB5SRC}/lib/kafs ${KRB5SRC}/man +.PATH: ${DIR_KAFS} ${KRB5SRC}/man SRCS+= afssys_openbsd.c \ afskrb5.c \ @@ -22,6 +22,6 @@ MLINKS+=kafs.3 k_hasafs.3 \ kafs.3 krb_afslog.3 \ kafs.3 krb_afslog_uid.3 -kafs_common.c: ${KRB5SRC}/lib/kafs/common.c - ln -sf ${KRB5SRC}/lib/kafs/common.c kafs_common.c +kafs_common.c: ${DIR_KAFS}/common.c + ln -sf ${DIR_KAFS}/common.c kafs_common.c CLEANFILES+=kafs_common.c diff --git a/lib/libkrb5/Makefile.krb5.inc b/lib/libkrb5/Makefile.krb5.inc index 8eebc470ddb..ecd6b4bcc24 100644 --- a/lib/libkrb5/Makefile.krb5.inc +++ b/lib/libkrb5/Makefile.krb5.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.krb5.inc,v 1.5 2003/05/17 21:17:39 mho Exp $ +# $OpenBSD: Makefile.krb5.inc,v 1.6 2003/06/23 14:39:14 mho Exp $ DIR_KRB5INC= ${.CURDIR}/../../kerberosV/include DIR_KRB5LIB= ${KRB5SRC}/lib/krb5 @@ -132,7 +132,7 @@ MAN+= krb5_unparse_name.3 MAN+= krb5_verify_user.3 MLINKS+=krb5_verify_user.3 krb5_verify_user_lrealm.3 -.PATH: ${KRB5SRC}/lib/krb5 +.PATH: ${DIR_KRB5LIB} gen_files_krb5= \ heim_err.h \ @@ -237,29 +237,29 @@ SRCS+= add_et_list.c \ k524_err.c \ ${gen_files_krb5} -CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/ \ - -I${KRB5SRC}/lib/asn1 -I../asn1 -I. \ +CFLAGS+=-I${DIR_KRB5LIB} -I${KRB5SRC}/lib/ \ + -I../asn1 -I. \ -DSHA1_CTX=SHA_CTX regen_krb5: - cd ${GENDIR}; compile_et ${KRB5SRC}/lib/krb5/heim_err.et - cd ${GENDIR}; compile_et ${KRB5SRC}/lib/krb5/k524_err.et - cd ${GENDIR}; compile_et ${KRB5SRC}/lib/krb5/krb5_err.et + cd ${GENDIR}; compile_et ${DIR_KRB5LIB}/heim_err.et + cd ${GENDIR}; compile_et ${DIR_KRB5LIB}/k524_err.et + cd ${GENDIR}; compile_et ${DIR_KRB5LIB}/krb5_err.et regen: regen_krb5 # There is a warn.c both in lib/roken and lib/krb5. krb5_warn.c: - ln -sf ${KRB5SRC}/lib/krb5/warn.c krb5_warn.c + ln -sf ${DIR_KRB5LIB}/warn.c krb5_warn.c CLEANFILES+=krb5_warn.c # There is a net_write.c and net_read.c both in lib/roken and lib/krb5. -krb5_net_write.c: ${KRB5SRC}/lib/krb5/net_write.c - ln -sf ${KRB5SRC}/lib/krb5/net_write.c krb5_net_write.c -krb5_net_read.c: ${KRB5SRC}/lib/krb5/net_read.c - ln -sf ${KRB5SRC}/lib/krb5/net_read.c krb5_net_read.c +krb5_net_write.c: ${DIR_KRB5LIB}/net_write.c + ln -sf ${DIR_KRB5LIB}/net_write.c krb5_net_write.c +krb5_net_read.c: ${DIR_KRB5LIB}/net_read.c + ln -sf ${DIR_KRB5LIB}/net_read.c krb5_net_read.c -krb5_keytab.c: ${KRB5SRC}/lib/krb5/keytab.c - ln -sf ${KRB5SRC}/lib/krb5/keytab.c krb5_keytab.c +krb5_keytab.c: ${DIR_KRB5LIB}/keytab.c + ln -sf ${DIR_KRB5LIB}/keytab.c krb5_keytab.c CLEANFILES+=krb5_net_{read,write}.c krb5_keytab.c |