From ad18fb995c808a63951fe7b1d7f0789e3260e409 Mon Sep 17 00:00:00 2001 From: ru Date: Sat, 31 Jan 2004 08:15:57 +0000 Subject: 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 --- kerberos5/lib/libroken/Makefile | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'kerberos5/lib/libroken/Makefile') diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile index 5572a3c..d145a55 100644 --- a/kerberos5/lib/libroken/Makefile +++ b/kerberos5/lib/libroken/Makefile @@ -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 .PATH: ${KRB5DIR}/lib/roken - -build-tools: make-roken -- cgit v1.1