diff options
author | ru <ru@FreeBSD.org> | 2004-01-31 08:15:57 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2004-01-31 08:15:57 +0000 |
commit | ad18fb995c808a63951fe7b1d7f0789e3260e409 (patch) | |
tree | 417a8210fba66662bdf1df5485b676fbe1a26449 /kerberos5/lib/libasn1 | |
parent | 56844e70af38fc60cc6e46aedb529f107dfacee5 (diff) | |
download | FreeBSD-src-ad18fb995c808a63951fe7b1d7f0789e3260e409.zip FreeBSD-src-ad18fb995c808a63951fe7b1d7f0789e3260e409.tar.gz |
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
Diffstat (limited to 'kerberos5/lib/libasn1')
-rw-r--r-- | kerberos5/lib/libasn1/Makefile | 86 |
1 files changed, 16 insertions, 70 deletions
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile index 6c4fa65..662ccce 100644 --- a/kerberos5/lib/libasn1/Makefile +++ b/kerberos5/lib/libasn1/Makefile @@ -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 -.include <bsd.lib.mk> +CLEANFILES= ${GEN} ${GEN:S/.x$/.c/} krb5_asn1.h asn1_files -.PATH: ${KRB5DIR}/lib/asn1 -.PATH: ${KRB5DIR}/lib/vers -.PATH: ${KRB5DIR}/lib/roken +.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 -beforedepend all: ${.OBJDIR}/roken.h +../../tools/asn1_compile/asn1_compile: + cd ${.CURDIR}/../../tools/asn1_compile && ${MAKE} .for I in ${GEN} -${I:S/.x/.c/}: ${I} - cmp -s ${.OODATE} ${.TARGET} 2> /dev/null || cp ${.OODATE} ${.TARGET} +${I:R}.c: ${I} + cat ${.ALLSRC} > ${.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} +.include <bsd.lib.mk> -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 +.PATH: ${KRB5DIR}/lib/asn1 |