This commit was generated by cvs2svn to track changes on a CVS vendor

[unix-history] / usr.bin / vi / Makefile

diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index 57671e6..fbb1588 100644 (file)
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -6,9 +6,9 @@ BINDIR?=        /usr/bin
 
 #CFLAGS=-g -DDEBUG
 #CFLAGS+=-pg
 
 #CFLAGS=-g -DDEBUG
 #CFLAGS+=-pg

-CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/obj -I${.CURDIR}/../include -I${.CURDIR}/../curses -I${.CURDIR}/ex -I${.CURDIR}/vi -I${.CURDIR}/../regex
+CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/obj -I${.CURDIR}/include -I${.CURDIR}/nex -I${.CURDIR}/nvi

 #STRIP=
 #STRIP=

-.PATH: ${.CURDIR}/ex ${.CURDIR}/sex ${.CURDIR}/vi ${.CURDIR}/svi \
+.PATH: ${.CURDIR}/nex ${.CURDIR}/sex ${.CURDIR}/nvi ${.CURDIR}/svi \

        ${.CURDIR}/xaw
 CLEANFILES+=ex
 
        ${.CURDIR}/xaw
 CLEANFILES+=ex
 


@@ -48,24 +48,18 @@ 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+=        -L${.CURDIR}/../curses/obj -L${.CURDIR}/../curses \
-       -L${.CURDIR}/../regex/obj -L${.CURDIR}/../regex \
-       -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
 
 LINKS= ${BINDIR}/vi ${BINDIR}/ex ${BINDIR}/vi ${BINDIR}/view
 

-all: .curses-stamp vi vi.1
-
-.curses-stamp:
-       @(cd ${.CURDIR}/curses; make obj)
-       @(cd ${.CURDIR}/curses; make)
-       touch -f .curses-stamp
+all: vi vi.1

 
 warn:: ${SRCS}
        -(cd ${.CURDIR} && \
 
 warn:: ${SRCS}
        -(cd ${.CURDIR} && \

-           gcc -Wall -O -DDEBUG -Iobj -Ivi -Iex -I. ${.ALLSRC} \
+           gcc -Wall -O -DDEBUG -Iobj -Invi -Inex -I. ${.ALLSRC} \

            -lcurses -ltermlib 2>&1 | \
            sed -e "/warning: .*sccsid.*defined but not used/d" \
                -e "/warning: suggest parentheses around/d" \
            -lcurses -ltermlib 2>&1 | \
            sed -e "/warning: .*sccsid.*defined but not used/d" \
                -e "/warning: suggest parentheses around/d" \


@@ -91,13 +85,13 @@ options.h: options.h.stub options.c # Makefile
 
 excmd.h: excmd.h.stub excmd.c # Makefile
        rm -f excmd.h
 
 excmd.h: excmd.h.stub excmd.c # Makefile
        rm -f excmd.h

-       cp ${.CURDIR}/ex/excmd.h.stub excmd.h
+       cp ${.CURDIR}/nex/excmd.h.stub excmd.h

        chmod 664 excmd.h
        (echo '/^\/\* C_[0-9A-Z_]* \*\/$$/ {'; \
         echo 'printf("#define %s %d\n", $$2, cnt++)'; \
         echo 'next'; \
         echo '}') > /tmp/__vi.excmd.h
        chmod 664 excmd.h
        (echo '/^\/\* C_[0-9A-Z_]* \*\/$$/ {'; \
         echo 'printf("#define %s %d\n", $$2, cnt++)'; \
         echo 'next'; \
         echo '}') > /tmp/__vi.excmd.h

-        awk -f /tmp/__vi.excmd.h ${.CURDIR}/ex/excmd.c >> excmd.h
+        awk -f /tmp/__vi.excmd.h ${.CURDIR}/nex/excmd.c >> excmd.h

         rm -f /tmp/__vi.excmd.h
 
 .include <bsd.prog.mk>
         rm -f /tmp/__vi.excmd.h
 
 .include <bsd.prog.mk>