make lpass1 a variable, since it sometimes lives in different places

[unix-history] / usr / src / lib / libcurses / Makefile

diff --git a/usr/src/lib/libcurses/Makefile b/usr/src/lib/libcurses/Makefile
index decbf3d..8804359 100644 (file)
--- a/usr/src/lib/libcurses/Makefile
+++ b/usr/src/lib/libcurses/Makefile
@@ -1,7 +1,7 @@
 #
 # cursor package maker
 #
 #
 # cursor package maker
 #

-# @(#)Makefile 1.2 (Berkeley) %G%
+# @(#)Makefile 1.6 (Berkeley) %G%

 #
 HEADERS=curses.h unctrl.h cr_ex.h
 CFILES=        box.c clear.c initscr.c endwin.c mvprintw.c mvscanw.c mvwin.c \
 #
 HEADERS=curses.h unctrl.h cr_ex.h
 CFILES=        box.c clear.c initscr.c endwin.c mvprintw.c mvscanw.c mvwin.c \


@@ -26,17 +26,20 @@ POBJS=      box.p clear.p initscr.p endwin.p mvprintw.p mvscanw.p mvwin.p \
 CTAGS= ctags
 CC=    cc
 LINT=  lint
 CTAGS= ctags
 CC=    cc
 LINT=  lint

+LPASS1=        /usr/lib/lint/lint1

 AR=    ar
 RM=    rm
 LN=    ln
 CFL=   
 CFLAGS=        -O ${CFL}
 AR=    ar
 RM=    rm
 LN=    ln
 CFL=   
 CFLAGS=        -O ${CFL}

+LDFLAGS=-n

 .SUFFIXES: .p
 
 .c.p:
 .SUFFIXES: .p
 
 .c.p:

+       rm -f x.c

        ln $*.c x.c
        ${CC} ${CFLAGS} -p -c x.c
        ln $*.c x.c
        ${CC} ${CFLAGS} -p -c x.c

-       mv x.o $*.p ; rm x.c
+       mv x.o $*.p

 
 libcurses: ${HEADERS} crlib
 
 
 libcurses: ${HEADERS} crlib
 


@@ -45,14 +48,12 @@ crlib: ${OBJS}
        ranlib crlib
 
 pcrlib: ${POBJS}
        ranlib crlib
 
 pcrlib: ${POBJS}

-       ${AR} ruv pcrlib ${POBJS}
+       rm -f x.c
+       ${AR} rv pcrlib $?

        ranlib pcrlib
 
 test:  crlib test.o
        ranlib pcrlib
 
 test:  crlib test.o

-       ${CC} ${CFLAGS} -o test test.o crlib -ltermlib
-
-a.out: crlib cat.o
-       ${CC} ${CFLAGS} cat.o crlib -ltermlib
+       ${CC} ${LDFLAGS} ${CFLAGS} -o test test.o crlib -ltermlib

 
 cat.o: curses.h
        ${CC} -c ${CFLAGS} cat.c
 
 cat.o: curses.h
        ${CC} -c ${CFLAGS} cat.c


@@ -83,7 +84,7 @@ tar:
        tar crvf curses.tar Makefile tags ${HEADERS} curses.ext ${CFILES} llib-lcurses
 
 llib-lcurses.ln: llib-lcurses
        tar crvf curses.tar Makefile tags ${HEADERS} curses.ext ${CFILES} llib-lcurses
 
 llib-lcurses.ln: llib-lcurses

-       -(/lib/cpp -C -Dlint llib-lcurses | /usr/lib/lpass1 > llib-lcurses.ln ) 2>&1 | grep -v warning
+       -(/lib/cpp -C -Dlint llib-lcurses | ${LPASS1} > llib-lcurses.ln ) 2>&1 | grep -v warning

 
 install:
        install -c crlib ${DESTDIR}/usr/lib/libcurses.a
 
 install:
        install -c crlib ${DESTDIR}/usr/lib/libcurses.a