More Makefile cleanups

1) Removed -lregex from LDADD. The regex code is in the standard library now
2) Added ${LIBUTIL} to DPADD
3) Added options.h and excmd.h to DPSRCS line so they get built first because
   the rest of the sources depend on them being built first.

diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index 652bddc..fbb1588 100644 (file)
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -48,10 +48,11 @@ SRCS+=      svi_confirm.c svi_ex.c svi_get.c svi_line.c svi_refresh.c \
 SRCS+= xaw_screen.c
 
 #LDADD+=-pg
 SRCS+= xaw_screen.c
 
 #LDADD+=-pg

-DPADD+= ${LIBCURSES} ${LIBTERM}
-LDADD+=         -lregex -lcurses -ltermlib -lutil
+DPADD+= ${LIBCURSES} ${LIBTERM} ${LIBUTIL}
+LDADD+=         -lcurses -ltermlib -lutil

 SPECHDR=excmd.h options.h
 CLEANFILES+=${SPECHDR}
 SPECHDR=excmd.h options.h
 CLEANFILES+=${SPECHDR}

+DPSRCS+=${SPECHDR}

 LINKS= ${BINDIR}/vi ${BINDIR}/ex ${BINDIR}/vi ${BINDIR}/view
 
 all: vi vi.1
 LINKS= ${BINDIR}/vi ${BINDIR}/ex ${BINDIR}/vi ${BINDIR}/view
 
 all: vi vi.1