Try a lot harder to get dependancies right. This involves some ugly

looking ${.OBJDIR} work that has the up-side of actually working
in upgrade and make -jN cases.

This needs to be revisited further, and it is conceivable that
the ${.OBJDIR} stuff can be simplified, but the sheer number of
edge cases and other causes make this Hard(tm). For now, this works.

1 files changed, 8 insertions, 4 deletions

diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index 5945327..6c4fa65 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -106,26 +106,30 @@ asn1_compile:					\
 	gen_length.c				\
 	hash.c					\
 	emalloc.c				\
-	lex.o					\
 	main.c					\
-	parse.o					\
 	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
 
-.ORDER: ${.OBJDIR}/parse.c ${.OBJDIR}/parse.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
 
-lex.o:		lex.l ${.OBJDIR}/parse.h ${.OBJDIR}/roken.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