diff options
author | Ruslan Ermilov <ru@FreeBSD.org> | 2004-01-31 08:15:57 +0000 |
---|---|---|
committer | Ruslan Ermilov <ru@FreeBSD.org> | 2004-01-31 08:15:57 +0000 |
commit | 11bf3600e871d5cf6246515a7fb384511ca31a57 (patch) | |
tree | 417a8210fba66662bdf1df5485b676fbe1a26449 /kerberos5/libexec/kadmind | |
parent | 8e587162d35fadde07d997720a580eb35a181594 (diff) | |
download | src-11bf3600e871d5cf6246515a7fb384511ca31a57.tar.gz src-11bf3600e871d5cf6246515a7fb384511ca31a57.zip |
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
Notes
Notes:
svn path=/head/; revision=125261
Diffstat (limited to 'kerberos5/libexec/kadmind')
-rw-r--r-- | kerberos5/libexec/kadmind/Makefile | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile index 33b598cf6762..93f995e88d1c 100644 --- a/kerberos5/libexec/kadmind/Makefile +++ b/kerberos5/libexec/kadmind/Makefile @@ -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 |