d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kerberos5: normalize paths using SRCTOP-relative paths or :H when possible

Browse Source 
This simplifies make logic/output

MFC after:	1 month
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Enji Cooper 2017-03-04 11:34:36 +00:00
parent 22289a8c3d
commit 4c3e79cedd
12 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kerberos5/Makefile
View File

@ -11,7 +11,7 @@ KPROGS= lib/libpam \
# This target is used to rebuild these programs WITH Kerberos. # This target is used to rebuild these programs WITH Kerberos.
kerberize: kerberize:
.for entry in ${KPROGS} .for entry in ${KPROGS}
cd ${.CURDIR}/../${entry}; \ cd ${.CURDIR:H}/${entry}; \
${MAKE} cleandir; \ ${MAKE} cleandir; \
${MAKE} obj; \ ${MAKE} obj; \
${MAKE} all; \ ${MAKE} all; \
@ -21,7 +21,7 @@ kerberize:
# This target is used to rebuild these programs WITHOUT Kerberos. # This target is used to rebuild these programs WITHOUT Kerberos.
dekerberize: dekerberize:
.for entry in ${KPROGS} .for entry in ${KPROGS}
cd ${.CURDIR}/../${entry}; \ cd ${.CURDIR:H}/${entry}; \
${MAKE} MK_KERBEROS=no cleandir; \ ${MAKE} MK_KERBEROS=no cleandir; \
${MAKE} MK_KERBEROS=no obj; \ ${MAKE} MK_KERBEROS=no obj; \
${MAKE} MK_KERBEROS=no all; \ ${MAKE} MK_KERBEROS=no all; \

4
kerberos5/Makefile.inc
View File

@ -4,9 +4,9 @@
NO_LINT= NO_LINT=
KRB5DIR= ${.CURDIR}/../../../crypto/heimdal KRB5DIR= ${SRCTOP}/crypto/heimdal
CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../../include CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR:H:H}/include
.if ${MK_OPENLDAP} != "no" && !defined(COMPAT_32BIT) .if ${MK_OPENLDAP} != "no" && !defined(COMPAT_32BIT)
OPENLDAPBASE?= /usr/local OPENLDAPBASE?= /usr/local

2
kerberos5/lib/libgssapi_krb5/Makefile
View File

@ -82,4 +82,4 @@ CFLAGS+=-I${KRB5DIR}/lib/roken -I.
.include <bsd.lib.mk> .include <bsd.lib.mk>
.PATH: ${KRB5DIR}/lib/gssapi/krb5 ${.CURDIR}/../../../lib/libgssapi .PATH: ${KRB5DIR}/lib/gssapi/krb5 ${SRCTOP}/lib/libgssapi

2
kerberos5/lib/libgssapi_ntlm/Makefile
View File

@ -45,4 +45,4 @@ CFLAGS+=-I${KRB5DIR}/lib/ntlm
.include <bsd.lib.mk> .include <bsd.lib.mk>
.PATH: ${KRB5DIR}/lib/gssapi/ntlm ${.CURDIR}/../../../lib/libgssapi ${.CURDIR}/../libgssapi_krb5 .PATH: ${KRB5DIR}/lib/gssapi/ntlm ${SRCTOP}/lib/libgssapi ${.CURDIR:H}/libgssapi_krb5

4
kerberos5/lib/libgssapi_spnego/Makefile
View File

@ -31,7 +31,7 @@ CFLAGS+=-I${KRB5DIR}/lib/gssapi
CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi
CFLAGS+=-I${KRB5DIR}/lib/gssapi/spnego CFLAGS+=-I${KRB5DIR}/lib/gssapi/spnego
CFLAGS+=-I${KRB5DIR}/lib/asn1 CFLAGS+=-I${KRB5DIR}/lib/asn1
CFLAGS+=-I${.CURDIR}/../../../lib/libgssapi CFLAGS+=-I${SRCTOP}/lib/libgssapi
CFLAGS+=-I${KRB5DIR}/lib/roken -I. CFLAGS+=-I${KRB5DIR}/lib/roken -I.
CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} \ CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} \
@ -55,4 +55,4 @@ ${GEN}: spnego.asn1 spnego.opt
.SUFFIXES: .h .c .x .hx .SUFFIXES: .h .c .x .hx
.PATH: ${KRB5DIR}/lib/gssapi/spnego ${.CURDIR}/../../../lib/libgssapi ${.CURDIR}/../libgssapi_krb5 .PATH: ${KRB5DIR}/lib/gssapi/spnego ${SRCTOP}/lib/libgssapi ${.CURDIR:H}/libgssapi_krb5

2
kerberos5/lib/libhdb/Makefile
View File

@ -57,7 +57,7 @@ SRCS= common.c \
${GEN:S/.x$/.c/:S/.hx$/.h/} ${GEN:S/.x$/.c/:S/.hx$/.h/}
CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \ CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/roken -I${.CURDIR}/../../../contrib/sqlite3/ \ -I${KRB5DIR}/lib/roken -I${SRCTOP}/contrib/sqlite3/ \
-I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/krb5 \
-I. ${LDAPCFLAGS} -I. ${LDAPCFLAGS}
CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\"" CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\""

2
kerberos5/lib/libkafs5/Makefile
View File

@ -26,7 +26,7 @@ SRCS= afssys.c afskrb5.c common.c krb5_err.h
CFLAGS+= -I${KRB5DIR}/lib/kafs \ CFLAGS+= -I${KRB5DIR}/lib/kafs \
-I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/krb5 \
-I${.OBJDIR}/../libkrb5/ \ -I${.OBJDIR:H}/libkrb5/ \
-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/roken
CLEANFILES= kafs5.3 CLEANFILES= kafs5.3

2
kerberos5/lib/libkrb5/Makefile
View File

@ -625,4 +625,4 @@ CFLAGS+= -I${KRB5DIR}/lib/krb5 \
.include <bsd.lib.mk> .include <bsd.lib.mk>
.PATH: ${KRB5DIR}/lib/krb5 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/include ${.CURDIR}/../../include ${KRB5DIR}/doc/doxyout/krb5/man/man3/ .PATH: ${KRB5DIR}/lib/krb5 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/include ${SRCTOP}/kerberos5/include ${KRB5DIR}/doc/doxyout/krb5/man/man3/

2
kerberos5/libexec/hprop/Makefile
View File

@ -9,7 +9,7 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1
CFLAGS+=-I${KRB5DIR}/lib/hx509 CFLAGS+=-I${KRB5DIR}/lib/hx509
CFLAGS+=-I${KRB5DIR}/lib/ntlm CFLAGS+=-I${KRB5DIR}/lib/ntlm
CFLAGS+=-I${KRB5DIR}/kdc CFLAGS+=-I${KRB5DIR}/kdc
CFLAGS+=-I${.OBJDIR}/../../lib/libkrb5 CFLAGS+=-I${.OBJDIR:H:H}/lib/libkrb5
LIBADD= hdb krb5 roken vers LIBADD= hdb krb5 roken vers
DPADD= ${LDAPDPADD} DPADD= ${LDAPDPADD}
LDADD= ${LDAPLDADD} LDADD= ${LDAPLDADD}

2
kerberos5/libexec/kpasswdd/Makefile
View File

@ -2,7 +2,7 @@
PROG= kpasswdd PROG= kpasswdd
MAN= kpasswdd.8 MAN= kpasswdd.8
CFLAGS+=-I${KRB5DIR}/lib/roken -I../../lib/libhdb ${LDAPCFLAGS} CFLAGS+=-I${KRB5DIR}/lib/roken -I${.CURDIR:H:H}/lib/libhdb ${LDAPCFLAGS}
LIBADD= kadm5srv hdb krb5 roken vers asn1 LIBADD= kadm5srv hdb krb5 roken vers asn1
DPADD= ${LDAPDPADD} DPADD= ${LDAPDPADD}
LDADD= ${LDAPLDADD} LDADD= ${LDAPLDADD}

2
kerberos5/tools/asn1_compile/Makefile
View File

@ -2,7 +2,7 @@
PROG= asn1_compile PROG= asn1_compile
MAN= MAN=
LIBROKEN_A= ${.OBJDIR}/../../lib/libroken/libroken.a LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libroken.a
LIBADD= vers LIBADD= vers
LDADD= ${LIBROKEN_A} LDADD= ${LIBROKEN_A}
DPADD= ${LIBROKEN_A} DPADD= ${LIBROKEN_A}

4
kerberos5/tools/slc/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PROG= slc PROG= slc
LIBROKEN_A= ${.OBJDIR}/../../lib/libroken/libroken.a LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libroken.a
LIBADD= vers LIBADD= vers
LDADD= ${LIBROKEN_A} LDADD= ${LIBROKEN_A}
DPADD= ${LIBROKEN_A} DPADD= ${LIBROKEN_A}
@ -18,7 +18,7 @@ CLEANFILES= roken.h slc-gram.c slc-lex.c
roken.h: roken.h:
${MAKE_ROKEN} > ${.TARGET} ${MAKE_ROKEN} > ${.TARGET}
# ${.OBJDIR}/../make-roken/make-roken > ${.TARGET} # ${.OBJDIR:H}/make-roken/make-roken > ${.TARGET}
.include <bsd.prog.mk> .include <bsd.prog.mk>