Overhaul of kerberos5/ makefiles. Most significant changes are:

- Dropped support for standalone builds, this was only partially
  supported anyway, and required so much magic in makefiles that
  made life dangerous (e.g., by using the custom yacc rules).

- Got rid of .OBJDIR in makefiles -- makes building of individual
  files possible again.

- Made the .x.c transformations -j safe.

- Reprogrammed LDADD to fix static build of some utilities that
  was broken.

- Fixed LDFLAGS and DPADD in the WITH_OPENLDAP case -- positively
  affects the contents of .depend files.

- Removed redundant .h's from SRCS, only kept those that are
  generated.

- libkrb5/ INCS were bogusly installed again with libgssapi/.

- Made build-tools real tools with their own makefiles in
  separate directories.  This allows us to properly track
  their dependencies, etc.

- Faster build, 21% less of makefile code!

Approved by:	nectar
Reviewed by:	markm
Silence on:	arch
This commit is contained in:
ru 2004-01-31 08:15:57 +00:00
parent 3b76fe3dcb
commit af29e4e0d1
38 changed files with 270 additions and 655 deletions

View File

@ -698,8 +698,7 @@ _fortran= gnu/usr.bin/cc/f771
.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
!defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS)
_libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \
kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl
_kerberos5_tools= kerberos5/tools
.endif
.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE)
@ -713,7 +712,6 @@ build-tools:
${_rescue} \
gnu/usr.bin/cc/cc_tools \
${_fortran} \
${_libkrb5} \
lib/libncurses \
${_share} \
${_aicasm} \
@ -725,6 +723,14 @@ build-tools:
${MAKE} DIRPRFX=${_tool}/ obj; \
${MAKE} DIRPRFX=${_tool}/ build-tools
.endfor
.for _tool in \
${_kerberos5_tools}
@${ECHODIR} "===> ${_tool}"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
${MAKE} DIRPRFX=${_tool}/ depend; \
${MAKE} DIRPRFX=${_tool}/ all
.endfor
#
# cross-tools: Build cross-building tools

View File

@ -1,6 +1,6 @@
# $FreeBSD$
SUBDIR= doc lib libexec usr.bin usr.sbin
SUBDIR= doc tools lib libexec usr.bin usr.sbin
# These are the programs which depend on Kerberos.
KPROGS= lib/libpam \
@ -10,22 +10,22 @@ KPROGS= lib/libpam \
kerberize:
.for entry in ${KPROGS}
cd ${.CURDIR}/../${entry}; \
${MAKE} ${MFLAGS} cleandir; \
${MAKE} ${MFLAGS} obj; \
${MAKE} ${MFLAGS} depend; \
${MAKE} ${MFLAGS} all; \
${MAKE} ${MFLAGS} install
${MAKE} cleandir; \
${MAKE} obj; \
${MAKE} depend; \
${MAKE} all; \
${MAKE} install
.endfor
# This target is used to rebuild these programs WITHOUT Kerberos.
dekerberize:
.for entry in ${KPROGS}
cd ${.CURDIR}/../${entry}; \
${MAKE} ${MFLAGS} -DNO_KERBEROS cleandir; \
${MAKE} ${MFLAGS} -DNO_KERBEROS obj; \
${MAKE} ${MFLAGS} -DNO_KERBEROS depend; \
${MAKE} ${MFLAGS} -DNO_KERBEROS all; \
${MAKE} ${MFLAGS} -DNO_KERBEROS install
${MAKE} -DNO_KERBEROS cleandir; \
${MAKE} -DNO_KERBEROS obj; \
${MAKE} -DNO_KERBEROS depend; \
${MAKE} -DNO_KERBEROS all; \
${MAKE} -DNO_KERBEROS install
.endfor
.include <bsd.subdir.mk>

View File

@ -3,44 +3,18 @@
DISTRIBUTION?= crypto
NOLINT= true
.if !defined(INCLUDEOBJDIR)
KRB5DIR= ${.CURDIR}/../../../crypto/heimdal
ROKENDIR= ${.CURDIR}/../../lib/libroken
CFLAGS+=-I${INCLUDEOBJDIR} -DHAVE_CONFIG_H
CFLAGS+= -I${.CURDIR}/../../include -DHAVE_CONFIG_H
CFLAGS+=-DINET6
.if defined(WITH_OPENLDAP)
OPENLDAPBASE?= /usr/local
LDAPLIBS=-lldap -llber
LDAPCFLAGS=-I${OPENLDAPBASE}/include -DOPENLDAP=1
LDAPLDADD=-L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib ${LDAPLIBS}
.endif
.if exists(${.OBJDIR}/../../include)
INCLUDEOBJDIR= ${.OBJDIR}/../../include
.else
INCLUDEOBJDIR= ${.CURDIR}/../../include
.endif
.if exists(${.OBJDIR}/../../lib/libasn1)
ASN1OBJDIR= ${.OBJDIR}/../../lib/libasn1
.else
ASN1OBJDIR= ${.CURDIR}/../../lib/libasn1
.endif
.if exists(${.OBJDIR}/../../lib/libhdb)
HDBOBJDIR= ${.OBJDIR}/../../lib/libhdb
.else
HDBOBJDIR= ${.CURDIR}/../../lib/libhdb
.endif
.if exists(${.OBJDIR}/../../lib/libroken)
ROKENOBJDIR= ${.OBJDIR}/../../lib/libroken
.else
ROKENOBJDIR= ${.CURDIR}/../../lib/libroken
LDAPLDADD= -lldap -llber
LDAPDPADD= ${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;}
LDAPCFLAGS= -I${OPENLDAPBASE}/include -DOPENLDAP=1
LDAPLDFLAGS= -L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib
.endif
.if exists(${.OBJDIR}/../../lib/libvers)
@ -49,77 +23,31 @@ LIBVERS= ${.OBJDIR}/../../lib/libvers/libvers.a
LIBVERS= ${.CURDIR}/../../lib/libvers/libvers.a
.endif
.if exists(${.OBJDIR}/../../lib/libkrb5)
KRB5OBJDIR= ${.OBJDIR}/../../lib/libkrb5
.else
KRB5OBJDIR= ${.CURDIR}/../../lib/libkrb5
.endif
.if exists(${.OBJDIR}/../../lib/libsl)
LIBSL= ${.OBJDIR}/../../lib/libsl/libsl.a
.else
LIBSL= ${.CURDIR}/../../lib/libsl/libsl.a
.endif
COMPILE_ET= compile_et
.if defined(SRCS)
.ORDER: asn1_err.c ${.OBJDIR}/asn1_err.h
asn1_err.c ${.OBJDIR}/asn1_err.h: ${KRB5DIR}/lib/asn1/asn1_err.et
test -e ${.OBJDIR}/asn1_err.et || ln -sf ${.ALLSRC}
${COMPILE_ET} asn1_err.et
CLEANFILES+=asn1_err.h asn1_err.c asn1_err.et
.ORDER: hdb_err.c ${.OBJDIR}/hdb_err.h
hdb_err.c ${.OBJDIR}/hdb_err.h: ${KRB5DIR}/lib/hdb/hdb_err.et
test -e ${.OBJDIR}/hdb_err.et || ln -sf ${.ALLSRC}
${COMPILE_ET} hdb_err.et
CLEANFILES+=hdb_err.h hdb_err.c hdb_err.et
.ORDER: heim_err.c ${.OBJDIR}/heim_err.h
heim_err.c ${.OBJDIR}/heim_err.h: ${KRB5DIR}/lib/krb5/heim_err.et
test -e ${.OBJDIR}/heim_err.et || ln -sf ${.ALLSRC}
${COMPILE_ET} heim_err.et
CLEANFILES+=heim_err.h heim_err.c heim_err.et
.ORDER: krb5_err.c ${.OBJDIR}/krb5_err.h
krb5_err.c ${.OBJDIR}/krb5_err.h: ${KRB5DIR}/lib/krb5/krb5_err.et
test -e ${.OBJDIR}/krb5_err.et || ln -sf ${.ALLSRC}
${COMPILE_ET} krb5_err.et
CLEANFILES+=krb5_err.h krb5_err.c krb5_err.et
.ORDER: kadm5_err.c ${.OBJDIR}/kadm5_err.h
kadm5_err.c ${.OBJDIR}/kadm5_err.h: \
${KRB5DIR}/lib/kadm5/kadm5_err.et
test -e ${.OBJDIR}/kadm5_err.et || ln -sf ${.ALLSRC}
${COMPILE_ET} kadm5_err.et
CLEANFILES+=kadm5_err.h kadm5_err.c kadm5_err.et
.ORDER: k524_err.c ${.OBJDIR}/k524_err.h
k524_err.c ${.OBJDIR}/k524_err.h: \
${KRB5DIR}/lib/krb5/k524_err.et
test -e ${.OBJDIR}/k524_err.et || ln -sf ${.ALLSRC}
${COMPILE_ET} k524_err.et
CLEANFILES+=k524_err.h k524_err.c k524_err.et
${.OBJDIR}/roken.h: make-roken
./make-roken > tmp.h ;\
if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \
else rm -f roken.h; mv tmp.h roken.h; fi
make-roken.c: ${KRB5DIR}/lib/roken/roken.awk ${KRB5DIR}/lib/roken/roken.h.in
awk -f ${.ALLSRC} > ${.TARGET}
CLEANFILES+= make-roken.c make-roken roken.h
.else
KRB5DIR= ${.CURDIR}/../../crypto/heimdal
ROKENDIR= ${.CURDIR}/../../lib/libroken
ETSRCS= \
${KRB5DIR}/lib/asn1/asn1_err.et \
${KRB5DIR}/lib/hdb/hdb_err.et \
${KRB5DIR}/lib/kadm5/kadm5_err.et \
${KRB5DIR}/lib/krb5/heim_err.et \
${KRB5DIR}/lib/krb5/k524_err.et \
${KRB5DIR}/lib/krb5/krb5_err.et
.for ET in ${ETSRCS}
.for _ET in ${ET:T:R}
.if ${SRCS:M${_ET}.[ch]} != ""
.ORDER: ${_ET}.c ${_ET}.h
${_ET}.c ${_ET}.h: ${ET}
compile_et ${.ALLSRC}
CLEANFILES+= ${_ET}.h ${_ET}.c
.endif
.endfor
.endfor
.endif defined(SRCS)

View File

@ -1,11 +0,0 @@
# $FreeBSD$
.if exists(${.OBJDIR}/../../include)
INCLUDEOBJDIR= ${.OBJDIR}/../include
.else
INCLUDEOBJDIR= ${.CURDIR}/../include
.endif
depend lint tags:
.include <bsd.prog.mk>

View File

@ -1,5 +1,6 @@
# $FreeBSD$
SUBDIR= libroken libvers libasn1 libhdb libkafs5 libkrb5 libkadm5clnt libkadm5srv libsl libgssapi
SUBDIR= libasn1 libgssapi libhdb libkadm5clnt libkadm5srv \
libkafs5 libkrb5 libroken libsl libvers
.include <bsd.subdir.mk>

View File

@ -10,16 +10,13 @@ SRCS= \
der_copy.c \
timegm.c \
asn1_err.c \
${.OBJDIR}/asn1_err.h \
${.OBJDIR}/krb5_asn1.h \
${.OBJDIR}/roken.h \
${GEN:S/.x/.c/g}
asn1_err.h \
krb5_asn1.h \
${GEN:S/.x$/.c/}
CFLAGS+=-I${KRB5DIR}/include \
-I${KRB5DIR}/lib/asn1 \
CFLAGS+=-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/roken \
-I${INCLUDEOBJDIR} \
-I${.OBJDIR}
-I.
GEN= \
asn1_APOptions.x \
@ -74,73 +71,22 @@ GEN= \
asn1_TransitedEncoding.x \
asn1_UNSIGNED.x
INCS= ${.OBJDIR}/krb5_asn1.h ${.OBJDIR}/asn1_err.h
INCS= krb5_asn1.h asn1_err.h
CLEANFILES= ${GEN} ${GEN:S/.x$/.c/} krb5_asn1.h asn1_files
.ORDER: ${GEN} krb5_asn1.h
${GEN} krb5_asn1.h: k5.asn1 ../../tools/asn1_compile/asn1_compile
../../tools/asn1_compile/asn1_compile ${.ALLSRC:M*.asn1} krb5_asn1
../../tools/asn1_compile/asn1_compile:
cd ${.CURDIR}/../../tools/asn1_compile && ${MAKE}
.for I in ${GEN}
${I:R}.c: ${I}
cat ${.ALLSRC} > ${.TARGET}
.endfor
.include <bsd.lib.mk>
.PATH: ${KRB5DIR}/lib/asn1
.PATH: ${KRB5DIR}/lib/vers
.PATH: ${KRB5DIR}/lib/roken
beforedepend all: ${.OBJDIR}/roken.h
.for I in ${GEN}
${I:S/.x/.c/}: ${I}
cmp -s ${.OODATE} ${.TARGET} 2> /dev/null || cp ${.OODATE} ${.TARGET}
.endfor
CLEANFILES+= ${GEN:S/.x/.c/g} krb5_asn1.h asn1_files
${GEN} ${.OBJDIR}/krb5_asn1.h: asn1_compile k5.asn1
./asn1_compile ${KRB5DIR}/lib/asn1/k5.asn1 krb5_asn1
build-tools: make-print-version make-roken asn1_compile
asn1_compile: \
gen.c \
gen_copy.c \
gen_decode.c \
gen_encode.c \
gen_free.c \
gen_glue.c \
gen_length.c \
hash.c \
emalloc.c \
main.c \
symbol.c \
getarg.c \
warnerr.c \
${.OBJDIR}/lex.o \
${.OBJDIR}/parse.o \
${.OBJDIR}/print_version.o \
get_window_size.c \
strupr.c
${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.OODATE} ${LDADD}
.ORDER: ${.OBJDIR}/roken.h ${.OBJDIR}/parse.c ${.OBJDIR}/parse.h ${.OBJDIR}/lex.c
${.OBJDIR}/parse.o: ${.OBJDIR}/parse.c ${.OBJDIR}/roken.h
${.OBJDIR}/lex.o: ${.OBJDIR}/lex.c ${.OBJDIR}/parse.h ${.OBJDIR}/roken.h
${.OBJDIR}/parse.h ${.OBJDIR}/parse.c: parse.y
${YACC} -d ${.OODATE}
cp y.tab.c parse.c
cp y.tab.h parse.h
${.OBJDIR}/lex.c: lex.l
${LEX} -t ${LFLAGS} ${.OODATE} > ${.TARGET}
${.OBJDIR}/print_version.o: ${.OBJDIR}/print_version.h print_version.c \
${.OBJDIR}/roken.h
${CC} ${CFLAGS} -c -o ${.TARGET} ${KRB5DIR}/lib/vers/print_version.c
${.OBJDIR}/print_version.h: make-print-version
./make-print-version print_version.h
make-print-version: make-print-version.c
${CC} ${CFLAGS} -static -o ${.TARGET} ${.OODATE}
CLEANFILES+= ${GEN} asn1_compile lex.o parse.o parse.c parse.h \
hdb_asn1.h make-print-version print_version.h print_version.o \
y.tab.c y.tab.h

View File

@ -25,7 +25,6 @@ SRCS= \
external.c \
get_mic.c \
gssapi.h \
gssapi_locl.h \
import_name.c \
import_sec_context.c \
indicate_mechs.c \
@ -46,24 +45,15 @@ SRCS= \
v1.c \
verify_mic.c \
wrap.c \
address_to_krb5addr.c \
${.OBJDIR}/heim_err.h \
${.OBJDIR}/krb5_err.h \
${.OBJDIR}/k524_err.h
address_to_krb5addr.c
CFLAGS+=-I${KRB5DIR}/lib/gssapi \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/des \
-I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
-I.
INCS= gssapi.h \
${.OBJDIR}/heim_err.h \
${.OBJDIR}/krb5_err.h \
${.OBJDIR}/k524_err.h
INCS= gssapi.h
MAN= \
gss_acquire_cred.3 \

View File

@ -6,8 +6,8 @@ INCS= \
hdb-private.h \
hdb-protos.h \
hdb.h \
${.OBJDIR}/hdb_asn1.h \
${.OBJDIR}/hdb_err.h
hdb_asn1.h \
hdb_err.h
SRCS= \
common.c \
@ -20,21 +20,14 @@ SRCS= \
ndbm.c \
print.c \
hdb_err.c \
${.OBJDIR}/hdb_err.h \
${.OBJDIR}/hdb_asn1.h \
${.OBJDIR}/k524_err.h \
${.OBJDIR}/krb5_err.h \
${.OBJDIR}/heim_err.h \
${GEN:S/.x/.c/g}
hdb_err.h \
hdb_asn1.h \
${GEN:S/.x$/.c/}
CFLAGS+=-I${KRB5DIR}/include \
-I${INCLUDEOBJDIR} \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/hdb \
CFLAGS+=-I${KRB5DIR}/lib/hdb \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/roken \
-I${.OBJDIR} \
-I${ASN1OBJDIR} \
-I. \
${LDAPCFLAGS}
GEN= \
@ -45,70 +38,20 @@ GEN= \
asn1_hdb_entry.x \
asn1_Salt.x
CLEANFILES= ${GEN} ${GEN:S/.x$/.c/} hdb_asn1.h asn1_files
.ORDER: ${GEN} hdb_asn1.h
${GEN} hdb_asn1.h: hdb.asn1 ../../tools/asn1_compile/asn1_compile
../../tools/asn1_compile/asn1_compile ${.ALLSRC:M*.asn1} hdb_asn1
../../tools/asn1_compile/asn1_compile:
cd ${.CURDIR}/../../tools/asn1_compile && ${MAKE}
.for I in ${GEN}
${I:R}.c: ${I}
cat ${.ALLSRC} > ${.TARGET}
.endfor
.include <bsd.lib.mk>
.PATH: ${KRB5DIR}/lib/hdb
.PATH: ${KRB5DIR}/lib/asn1
.PATH: ${KRB5DIR}/lib/vers
.PATH: ${KRB5DIR}/lib/roken
build-tools: make-print-version asn1_compile
.for I in ${GEN}
${I:S/.x/.c/}: ${I}
cmp -s ${.OODATE} ${.TARGET} 2> /dev/null || cp ${.OODATE} ${.TARGET}
.endfor
CLEANFILES+= ${GEN:S/.x/.c/g} hdb_asn1.h asn1_files
${GEN} ${.OBJDIR}/hdb_asn1.h: asn1_compile hdb.asn1
./asn1_compile ${KRB5DIR}/lib/hdb/hdb.asn1 hdb_asn1
asn1_compile: \
gen.c \
gen_copy.c \
gen_decode.c \
gen_encode.c \
gen_free.c \
gen_glue.c \
gen_length.c \
hash.c \
emalloc.c \
main.c \
symbol.c \
getarg.c \
warnerr.c \
${.OBJDIR}/lex.o \
${.OBJDIR}/parse.o \
${.OBJDIR}/print_version.o \
get_window_size.c \
strupr.c
${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.OODATE} ${LDADD}
.ORDER: ${.OBJDIR}/roken.h ${.OBJDIR}/parse.c ${.OBJDIR}/parse.h ${.OBJDIR}/lex.c
${.OBJDIR}/parse.o: ${.OBJDIR}/parse.c ${.OBJDIR}/roken.h
${.OBJDIR}/lex.o: ${.OBJDIR}/lex.c ${.OBJDIR}/parse.h ${.OBJDIR}/roken.h
${.OBJDIR}/parse.h ${.OBJDIR}/parse.c: parse.y
${YACC} -d ${.OODATE}
cp y.tab.c parse.c
cp y.tab.h parse.h
${.OBJDIR}/lex.c: lex.l
${LEX} -t ${LFLAGS} ${.OODATE} > ${.TARGET}
${.OBJDIR}/print_version.o: ${.OBJDIR}/print_version.h print_version.c \
${.OBJDIR}/roken.h
${CC} ${CFLAGS} -c -o ${.TARGET} ${KRB5DIR}/lib/vers/print_version.c
${.OBJDIR}/print_version.h: make-print-version
./make-print-version print_version.h
make-print-version: make-print-version.c
${CC} ${CFLAGS} -static -o ${.TARGET} ${.OODATE}
CLEANFILES+= ${GEN} asn1_compile lex.o parse.o parse.c parse.h \
hdb_asn1.h make-print-version print_version.h print_version.o \
y.tab.c y.tab.h

View File

@ -6,7 +6,7 @@ INCS= \
admin.h \
kadm5-private.h \
kadm5-protos.h \
${.OBJDIR}/kadm5_err.h \
kadm5_err.h \
private.h
INCSDIR=${INCLUDEDIR}/kadm5
@ -29,20 +29,12 @@ SRCS= \
rename_c.c \
send_recv.c \
client_glue.c \
admin.h \
private.h \
kadm5_locl.h \
${.OBJDIR}/kadm5_err.h
kadm5_err.h
CFLAGS+=-I${KRB5DIR}/include \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/kadm5 \
-I${KRB5DIR}/lib/hdb \
CFLAGS+=-I${KRB5DIR}/lib/kadm5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/roken \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
-I.
.include <bsd.lib.mk>

View File

@ -29,21 +29,12 @@ SRCS= \
set_keys.c \
set_modifier.c \
password_quality.c \
server_glue.c \
admin.h \
kadm5_locl.h \
private.h \
${.OBJDIR}/kadm5_err.h
server_glue.c
CFLAGS+=-I${KRB5DIR}/include \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/kadm5 \
-I${KRB5DIR}/lib/hdb \
CFLAGS+=-I${KRB5DIR}/lib/kadm5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/roken \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
-I.
.include <bsd.lib.mk>

View File

@ -2,12 +2,8 @@
LIB= kafs5
CFLAGS+=-I${KRB5DIR}/lib/kafs \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/include \
-I${KRB5OBJDIR} \
-I${ASN1OBJDIR}
-I${KRB5DIR}/lib/roken
INCS= kafs.h
SRCS= afssys.c afskrb5.c common.c

View File

@ -99,23 +99,20 @@ SRCS= \
krb5_err.c \
k524_err.c \
heim_err.c \
${.OBJDIR}/k524_err.h \
${.OBJDIR}/heim_err.h
k524_err.h \
heim_err.h
CFLAGS+=-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/des \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/include \
-I${KRB5OBJDIR} \
-I${ASN1OBJDIR}
-I.
INCS= krb5.h \
krb5-protos.h \
${.CURDIR}/../../include/krb5-types.h \
${.OBJDIR}/heim_err.h \
${.OBJDIR}/krb5_err.h \
${.OBJDIR}/k524_err.h
krb5-types.h \
heim_err.h \
krb5_err.h \
k524_err.h
MAN= \
krb5.3 \
@ -323,4 +320,4 @@ MLINKS= \
.include <bsd.lib.mk>
.PATH: ${KRB5DIR}/lib/krb5
.PATH: ${KRB5DIR}/lib/des
.PATH: ${.CURDIR}/../../include

View File

@ -33,7 +33,6 @@ SRCS= \
resolve.c \
roken_gethostby.c \
rtbl.c \
rtbl.h \
signal.c \
simple_exec.c \
snprintf.c \
@ -46,25 +45,28 @@ SRCS= \
vis.c \
warnerr.c \
write_pid.c \
xdbm.h \
copyhostent.c \
strlwr.c \
strndup.c \
strnlen.c \
strsep_copy.c \
strupr.c \
${.OBJDIR}/roken.h
roken.h
CFLAGS+=-I${KRB5DIR}/include \
-I${INCLUDEOBJDIR} \
-I${KRB5DIR}/lib/roken \
-I${.OBJDIR}
CFLAGS+=-I${KRB5DIR}/lib/roken \
-I.
INCS= ${.OBJDIR}/roken.h \
${KRB5DIR}/lib/roken/roken-common.h
INCS= roken.h \
roken-common.h
roken.h: ../../tools/make-roken/make-roken
../../tools/make-roken/make-roken > ${.TARGET}
../../tools/make-roken/make-roken:
cd ${.CURDIR}/../../tools/make-roken && ${MAKE}
CLEANFILES= roken.h
.include <bsd.lib.mk>
.PATH: ${KRB5DIR}/lib/roken
build-tools: make-roken

View File

@ -2,19 +2,12 @@
LIB= sl
SRCS= \
sl.c \
${.OBJDIR}/roken.h
SRCS= sl.c
CFLAGS+=-I${KRB5DIR}/lib/sl \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/include \
-I${.OBJDIR}
CFLAGS+=-I${KRB5DIR}/lib/sl
INTERNALLIB= yes
.include <bsd.lib.mk>
.PATH: ${KRB5DIR}/lib/sl
build-tools: make-roken

View File

@ -4,25 +4,20 @@ LIB= vers
SRCS= \
print_version.c \
${.OBJDIR}/print_version.h
print_version.h
CFLAGS+=-I${KRB5DIR}/include \
-I${ROKENOBJDIR} \
-I${KRB5DIR}/lib/roken \
-I${.OBJDIR}
CFLAGS+=-I.
INTERNALLIB= YES
print_version.h: ../../tools/make-print-version/make-print-version
../../tools/make-print-version/make-print-version ${.TARGET}
../../tools/make-print-version/make-print-version:
cd ${.CURDIR}/../../tools/make-print-version && ${MAKE}
CLEANFILES= print_version.h
.include <bsd.lib.mk>
.PATH: ${KRB5DIR}/lib/vers
build-tools: make-print-version
${.OBJDIR}/print_version.h: make-print-version
./make-print-version print_version.h
make-print-version: make-print-version.c
${CC} ${CFLAGS} -static -o ${.TARGET} ${.OODATE}
CLEANFILES+= make-print-version print_version.h

View File

@ -5,27 +5,17 @@ PROG= hprop
SRCS= \
hprop.c \
mit_dump.c \
v4_dump.c \
hprop.h \
kadb.h \
${.OBJDIR}/hdb_err.h
v4_dump.c
CFLAGS+=-I${KRB5DIR}/include \
-I${KRB5DIR}/kdc \
CFLAGS+=-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/hdb \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
-I${KRB5DIR}/lib/asn1
LDADD= -lkrb5 -lkafs5 -lhdb -lroken ${LIBVERS} \
LDADD= -lkrb5 -lhdb -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
DPADD= ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
MAN= hprop.8

View File

@ -2,28 +2,18 @@
PROG= hpropd
SRCS= \
hpropd.c \
hprop.h \
${.OBJDIR}/hdb_err.h
CFLAGS+=-I${KRB5DIR}/include \
-I${KRB5DIR}/kdc \
CFLAGS+=-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/hdb \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR} \
${LDAPCFLAGS}
LDADD= -lkrb5 -lhdb -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
DPADD= ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
LDFLAGS= ${LDAPLDFLAGS}
MAN= hpropd.8

View File

@ -4,28 +4,21 @@ PROG= ipropd-master
SRCS= \
ipropd_master.c \
iprop.h \
kadm5_locl.h \
${.OBJDIR}/kadm5_err.h \
${.OBJDIR}/hdb_err.h
kadm5_err.h
CFLAGS+=-I${KRB5DIR}/include \
-I${KRB5DIR}/lib/kadm5 \
CFLAGS+=-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/hdb \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR} \
-I. \
${LDAPCFLAGS}
LDADD= -lkadm5srv -lkrb5 -lhdb -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
DPADD= ${LIBKADM5SRV} ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
NOMAN= yes

View File

@ -4,28 +4,21 @@ PROG= ipropd-slave
SRCS= \
ipropd_slave.c \
iprop.h \
kadm5_locl.h \
${.OBJDIR}/kadm5_err.h \
${.OBJDIR}/hdb_err.h
kadm5_err.h
CFLAGS+=-I${KRB5DIR}/include \
-I${KRB5DIR}/lib/kadm5 \
CFLAGS+=-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/hdb \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR} \
-I. \
${LDAPCFLAGS}
LDADD= -lkadm5srv -lkrb5 -lhdb -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
DPADD= ${LIBKADM5SRV} ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
NOMAN= yes

View File

@ -4,47 +4,23 @@ PROG= kadmind
SRCS= kadmind.c \
server.c \
kadm_conn.c \
${.OBJDIR}/kadm5/private.h \
${.OBJDIR}/kadm5/admin.h \
${.OBJDIR}/kadm5/kadm5_err.h
kadm_conn.c
CFLAGS+=-I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
CFLAGS+=-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/hdb \
-I${KRB5DIR}/lib/sl \
-I${KRB5DIR}/lib/kadm5 \
-I${KRB5DIR}/kadmin \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR} \
${LDAPCFLAGS}
LDADD= -lkrb5 -lroken ${LIBVERS} -lkadm5srv -lhdb \
-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} ${LIBKADM5SRV} ${LIBHDB} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
MAN= kadmind.8
.include <bsd.prog.mk>
.PATH: ${KRB5DIR}/kadmin
${.OBJDIR}/kadm5/private.h: ${.OBJDIR}/kadm5
cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}
${.OBJDIR}/kadm5/admin.h: ${.OBJDIR}/kadm5
cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}
${.OBJDIR}/kadm5/kadm5_err.h: ${.OBJDIR}/kadm5 ${.OBJDIR}/kadm5_err.h
cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
${.OBJDIR}/kadm5:
mkdir ${.TARGET}
CLEANFILES+= kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
CLEANDIRS+= kadm5

View File

@ -6,30 +6,24 @@ SRCS= \
524.c \
config.c \
connect.c \
kdc_locl.h \
kerberos4.c \
kerberos5.c \
log.c \
main.c \
misc.c
CFLAGS+=-I${KRB5DIR}/include \
-I${KRB5DIR}/kdc \
CFLAGS+=-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/hdb \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR} \
${LDAPCFLAGS}
LDADD= -lkrb5 -lhdb -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
DPADD= ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
MAN= kdc.8

View File

@ -2,46 +2,19 @@
PROG= kpasswdd
SRCS= \
kpasswdd.c \
${.OBJDIR}/krb5_err.h \
${.OBJDIR}/heim_err.h \
${.OBJDIR}/hdb_err.h \
${.OBJDIR}/kadm5/admin.h \
${.OBJDIR}/kadm5/private.h
CFLAGS+=-I${KRB5DIR}/include \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/hdb \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/kadm5 \
-I${KRB5DIR}/kpasswd \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR} \
CFLAGS+=-I${KRB5DIR}/lib/roken \
${LDAPCFLAGS}
LDADD= -lkrb5 -lroken ${LIBVERS} -lkadm5srv -lhdb \
-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} ${LIBKADM5SRV} ${LIBHDB} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
MAN= kpasswdd.8
.include <bsd.prog.mk>
.PATH: ${KRB5DIR}/kpasswd
${.OBJDIR}/kadm5/admin.h: ${.OBJDIR}/kadm5
cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}
${.OBJDIR}/kadm5/private.h: ${.OBJDIR}/kadm5
cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}
${.OBJDIR}/kadm5:
mkdir ${.TARGET}
CLEANFILES+= kadm5/admin.h kadm5/private.h
CLEANDIRS+= kadm5

5
kerberos5/tools/Makefile Normal file
View File

@ -0,0 +1,5 @@
# $FreeBSD$
SUBDIR= make-print-version asn1_compile make-roken
.include <bsd.subdir.mk>

View File

@ -0,0 +1,5 @@
# $FreeBSD$
realinstall:
.include "../Makefile.inc"

View File

@ -0,0 +1,42 @@
# $FreeBSD$
PROG= asn1_compile
NOMAN=
SRCS= \
gen.c \
gen_copy.c \
gen_decode.c \
gen_encode.c \
gen_free.c \
gen_glue.c \
gen_length.c \
hash.c \
emalloc.c \
main.c \
symbol.c \
getarg.c \
warnerr.c \
lex.l \
parse.y \
print_version.c \
print_version.h \
get_window_size.c \
strupr.c
CFLAGS+= -I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/asn1 -I.
print_version.h: ../make-print-version/make-print-version
../make-print-version/make-print-version ${.TARGET}
../make-print-version/make-print-version:
cd ${.CURDIR}/../make-print-version && ${MAKE}
CLEANFILES= print_version.h
.include <bsd.prog.mk>
.PATH: ${KRB5DIR}/lib/roken ${KRB5DIR}/lib/asn1 ${KRB5DIR}/lib/vers
# There are two print_version.c's, select the right one.
print_version.o: ${KRB5DIR}/lib/vers/print_version.c

View File

@ -0,0 +1,8 @@
# $FreeBSD$
PROG= make-print-version
NOMAN=
.include <bsd.prog.mk>
.PATH: ${KRB5DIR}/lib/vers

View File

@ -0,0 +1,11 @@
# $FreeBSD$
PROG= make-roken
NOMAN=
CLEANFILES= make-roken.c
.include <bsd.prog.mk>
make-roken.c: ${KRB5DIR}/lib/roken/roken.awk ${KRB5DIR}/lib/roken/roken.h.in
awk -f ${.ALLSRC} > ${.TARGET}

View File

@ -1,6 +1,6 @@
# $FreeBSD$
SUBDIR= kadmin kdestroy kinit klist kpasswd ksu krb5-config \
SUBDIR= kadmin kdestroy kinit klist kpasswd krb5-config ksu \
verify_krb5_conf
.include <bsd.subdir.mk>

View File

@ -16,55 +16,28 @@ SRCS= \
mod.c \
rename.c \
util.c \
random_password.c \
kadmin_locl.h \
${.OBJDIR}/krb5_err.h \
${.OBJDIR}/heim_err.h \
${.OBJDIR}/hdb_err.h \
${.OBJDIR}/kadm5/private.h \
${.OBJDIR}/kadm5/admin.h \
${.OBJDIR}/kadm5/kadm5_err.h
random_password.c
CFLAGS+=-I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
CFLAGS+=-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/hdb \
-I${KRB5DIR}/lib/sl \
-I${KRB5DIR}/lib/kadm5 \
-I${KRB5DIR}/kadmin \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR} \
${LDAPCFLAGS}
LDADD= -lkadm5clnt -lkadm5srv -lkrb5 -lroken \
${LIBVERS} -lhdb -lasn1 \
-lcrypto -lcrypt -lcom_err \
${LIBSL} -lreadline -lcurses ${LDAPLDADD}
${LIBSL} -lreadline -lncurses ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
DPADD= ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBKRB5} ${LIBROKEN} \
${LIBVERS} ${LIBHDB} ${LIBASN1} \
${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
${LIBSL} ${LIBREADLINE} ${LIBCURSES} ${LDAPLIBS}
${LIBSL} ${LIBREADLINE} ${LIBNCURSES} ${LDAPDPADD}
MAN= kadmin.8
.include <bsd.prog.mk>
.PATH: ${KRB5DIR}/kadmin
${.OBJDIR}/kadm5/private.h: ${.OBJDIR}/kadm5
cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}
${.OBJDIR}/kadm5/admin.h: ${.OBJDIR}/kadm5
cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}
${.OBJDIR}/kadm5/kadm5_err.h: ${.OBJDIR}/kadm5 ${.OBJDIR}/kadm5_err.h
cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
${.OBJDIR}/kadm5:
mkdir ${.TARGET}
CLEANFILES+= kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
CLEANDIRS+= kadm5

View File

@ -2,25 +2,12 @@
PROG= kdestroy
SRCS= \
kdestroy.c \
${.OBJDIR}/krb5_err.h \
${.OBJDIR}/heim_err.h \
${.OBJDIR}/k524_err.h
CFLAGS+=-I${KRB5DIR}/lib/roken
CFLAGS+=-I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/kafs \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
LDADD= -lkrb5 -lroken -lkafs5 ${LIBVERS} \
LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBKAFS5} ${LIBVERS} \
DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>

View File

@ -2,25 +2,12 @@
PROG= kinit
SRCS= kinit.c \
${.OBJDIR}/asn1_err.h \
${.OBJDIR}/krb5_err.h \
${.OBJDIR}/heim_err.h \
${.OBJDIR}/k524_err.h
CFLAGS+=-I${KRB5DIR}/lib/roken
CFLAGS+=-I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/kafs \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
LDADD= -lkrb5 -lroken -lkafs5 ${LIBVERS} \
LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBKAFS5} ${LIBVERS} \
DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>

View File

@ -2,25 +2,12 @@
PROG= klist
SRCS= \
klist.c \
${.OBJDIR}/krb5_err.h \
${.OBJDIR}/heim_err.h \
${.OBJDIR}/k524_err.h
CFLAGS+=-I${KRB5DIR}/lib/roken
CFLAGS+=-I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/kafs \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
LDADD= -lkrb5 -lroken -lkafs5 ${LIBVERS} \
LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBKAFS5} ${LIBVERS} \
DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>

View File

@ -2,19 +2,7 @@
PROG= kpasswd
SRCS= \
kpasswd.c \
${.OBJDIR}/krb5_err.h \
${.OBJDIR}/heim_err.h \
${.OBJDIR}/k524_err.h
CFLAGS+=-I${KRB5DIR}/include \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/kpasswd \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
CFLAGS+=-I${KRB5DIR}/lib/roken
LDADD= -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcrypt -lcom_err

View File

@ -19,7 +19,6 @@ krb5-config: krb5-config.in
-e "s,@LIBS\@,-lcom_err,g" \
-e "s,@INCLUDE_des@,,g" \
${.ALLSRC} > ${.TARGET}
chmod +x ${.TARGET}
.include <bsd.prog.mk>

View File

@ -2,26 +2,14 @@
PROG= ksu
SRCS= \
su.c \
${.OBJDIR}/asn1_err.h \
${.OBJDIR}/krb5_err.h \
${.OBJDIR}/heim_err.h \
${.OBJDIR}/k524_err.h
SRCS= su.c
CFLAGS+=-I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/kafs \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
CFLAGS+=-I${KRB5DIR}/lib/roken
LDADD= -lkrb5 -lroken -lkafs5 ${LIBVERS} \
LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBKAFS5} ${LIBVERS} \
DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
NOMAN= true

View File

@ -2,21 +2,14 @@
PROG= verify_krb5_conf
SRCS= verify_krb5_conf.c
CFLAGS+=-I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/kafs \
CFLAGS+=-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
-I${KRB5DIR}/lib/asn1
LDADD= -lkrb5 -lroken -lkafs5 ${LIBVERS} \
LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBKAFS5} ${LIBVERS} \
DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
MAN= verify_krb5_conf.8

View File

@ -2,26 +2,18 @@
PROG= kstash
SRCS= \
kstash.c \
${.OBJDIR}/hdb_err.h
CFLAGS+=-I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
CFLAGS+=-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/hdb \
-I${KRB5DIR}/kdc \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR} \
${LDAPCFLAGS}
LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
MAN= kstash.8

View File

@ -11,49 +11,21 @@ SRCS= \
list.c \
purge.c \
remove.c \
rename.c \
${.OBJDIR}/kadm5/private.h \
${.OBJDIR}/kadm5/admin.h \
${.OBJDIR}/kadm5/kadm5_err.h \
${.OBJDIR}/krb5_err.h \
${.OBJDIR}/heim_err.h \
${.OBJDIR}/k524_err.h
rename.c
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
CFLAGS+= -I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/sl \
-I${KRB5DIR}/lib/kadm5 \
-I${KRB5DIR}/admin \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
LDADD= -lkadm5clnt -lkrb5 -lroken ${LIBVERS} \
${LIBSL} -lasn1 -lcrypto -lcrypt -lcom_err \
-lreadline -lcurses
-lreadline -lncurses
DPADD= ${LIBKADM5CLNT} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
${LIBSL} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
${LIBREADLINE} ${LIBCURSES}
${LIBREADLINE} ${LIBNCURSES}
MAN= ktutil.8
.include <bsd.prog.mk>
.PATH: ${KRB5DIR}/admin
${.OBJDIR}/kadm5/private.h: ${.OBJDIR}/kadm5
cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}
${.OBJDIR}/kadm5/admin.h: ${.OBJDIR}/kadm5
cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}
${.OBJDIR}/kadm5/kadm5_err.h: ${.OBJDIR}/kadm5 ${.OBJDIR}/kadm5_err.h
cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
${.OBJDIR}/kadm5:
mkdir ${.TARGET}
CLEANFILES+= kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
CLEANDIRS+= kadm5