added vfontinfo vwidth pac

SCCS-vsn: usr.sbin/lpr/Makefile 4.7

diff --git a/usr/src/usr.sbin/lpr/Makefile b/usr/src/usr.sbin/lpr/Makefile
index c0bc974..373adfb 100644 (file)
--- a/usr/src/usr.sbin/lpr/Makefile
+++ b/usr/src/usr.sbin/lpr/Makefile
@@ -1,4 +1,4 @@
-#      @(#)Makefile    4.6     (Berkeley)      %G%
+#      @(#)Makefile    4.7     (Berkeley)      %G%

 #
 # makefile for line printer spooling system
 #
 #
 # makefile for line printer spooling system
 #


@@ -7,6 +7,7 @@
 # DAEMON       someone special
 # SPGRP                the group id of the spooling programs
 #
 # DAEMON       someone special
 # SPGRP                the group id of the spooling programs
 #

+

 CFLAGS=-O -DBSD41C
 LDFLAGS=
 LIBDIR=/usr/lib
 CFLAGS=-O -DBSD41C
 LDFLAGS=
 LIBDIR=/usr/lib


@@ -19,13 +20,15 @@ SPGRP=daemon
 DESTDIR=
 
 SRCS=  lpd.c rlpr.c lpr.c lpq.c lprm.c lpdrestart.c \
 DESTDIR=
 
 SRCS=  lpd.c rlpr.c lpr.c lpq.c lprm.c lpdrestart.c \

-       lpdchar.c getq.c printcap.c lpf.c necf.c
-OBJS=  lpd rlpr lpr lpq lprm lpdrestart
-FLTRS= lpf necf
+       lpdchar.c getq.c printcap.c lpf.c necf.c \
+       rvsort.c rvcat.c vsort.c vcat.c vpf.c vpsf.c \
+       vpltdmp.c vfontinfo.c vwidth.c pac.c
+OBJS=  lpd rlpr lpr lpq lprm lpdrestart vfontinfo vwidth pac
+FLTRS= lpf necf rvsort rvcat vsort vcat vpf vpsf vpltdmp

 
 all:   ${OBJS}
 
 
 all:   ${OBJS}
 

-filters: ${FILTERS}
+filters: ${FLTRS}

 
 lpd:   lpd.o lpdchar.o printcap.o getq.o
        ${CC} -o lpd ${LDFLAGS} lpd.o lpdchar.o printcap.o getq.o -ljobs
 
 lpd:   lpd.o lpdchar.o printcap.o getq.o
        ${CC} -o lpd ${LDFLAGS} lpd.o lpdchar.o printcap.o getq.o -ljobs


@@ -34,10 +37,10 @@ rlpr:       rlpr.o printcap.o
        ${CC} -o rlpr ${LDFLAGS} rlpr.o printcap.o
 
 lpr:   lpr.o printcap.o
        ${CC} -o rlpr ${LDFLAGS} rlpr.o printcap.o
 
 lpr:   lpr.o printcap.o

-       ${CC} -o lpr ${LDFLAGS} lpr.o -ljobs printcap.o
+       ${CC} -o lpr ${LDFLAGS} lpr.o printcap.o -ljobs

 
 lpq:   lpq.o printcap.o getq.o
 
 lpq:   lpq.o printcap.o getq.o

-       ${CC} -o lpq ${LDFLAGS} lpq.o -ltermcap printcap.o getq.o
+       ${CC} -o lpq ${LDFLAGS} lpq.o printcap.o getq.o -ltermcap

 
 lprm:  lprm.o printcap.o
        ${CC} -o lprm ${LDFLAGS} lprm.o printcap.o
 
 lprm:  lprm.o printcap.o
        ${CC} -o lprm ${LDFLAGS} lprm.o printcap.o


@@ -51,25 +54,69 @@ lpf:        lpf.c
 necf:  necf.c
        ${CC} -o necf ${CFLAGS} ${LDFLAGS} necf.c
 
 necf:  necf.c
        ${CC} -o necf ${CFLAGS} ${LDFLAGS} necf.c
 

-lpd.o rlpr.o lpr.o lpq.o lprm.o lpdrestart.o: lp.local.h
+rvsort:        rvsort.c
+       ${CC} -o rvsort ${CFLAGS} rvsort.c
+
+rvcat: rvcat.c
+       ${CC} -o rvcat ${CFLAGS} rvcat.c
+
+vsort: vsort.c
+       ${CC} -o vsort ${CFLAGS} vsort.c
+
+vcat:  vcat.c
+       ${CC} -o vcat ${CFLAGS} vcat.c
+
+vpf:   vpf.c
+       ${CC} -o vpf ${CFLAGS} vpf.c
+
+vpsf:  vpsf.c
+       ${CC} -o vpsf ${CFLAGS} vpsf.c
+
+vpltdmp: vpltdmp.c
+       ${CC} -o vpltdmp ${CFLAGS} vpltdmp.c
+
+vfontinfo: vfontinfo.c
+       ${CC} -o vfontinfo ${CFLAGS} vfontinfo.c
+
+vwidth: vwidth.c
+       ${CC} -o vwidth ${CFLAGS} vwidth.c
+
+pac:   pac.o printcap.o
+       ${CC} -o pac ${CFLAGS} pac.o printcap.o
+
+lpd.o rlpr.o lpr.o lpq.o lprm.o lpdrestart.o pac.o: lp.local.h

 lpd.o lpq.o getq.o: getq.h
 
 install: all
 lpd.o lpq.o getq.o: getq.h
 
 install: all

-       install -o ${ROOT} -m 6711 lpd ${DESTDIR}/${LIBDIR}/lpd
-       install -o ${DAEMON} -m 6711 rlpr ${DESTDIR}/${LIBDIR}/rlpr
-       install -o ${ROOT} -m 6711 lpr ${DESTDIR}/${BINDIR}/lpr
-       install -o ${ROOT} -m 6711 lpq ${DESTDIR}/${BINDIR}/lpq
-       install -o ${ROOT} -m 6711 lprm ${DESTDIR}/${BINDIR}/lprm
+       install -o ${ROOT} -m 6711 lpd ${DESTDIR}${LIBDIR}/lpd
+       install -o ${DAEMON} -m 6711 rlpr ${DESTDIR}${LIBDIR}/rlpr
+       install -o ${ROOT} -m 6711 lpr ${DESTDIR}${BINDIR}/lpr
+       install -o ${ROOT} -m 6711 lpq ${DESTDIR}${BINDIR}/lpq
+       install -o ${ROOT} -m 6711 lprm ${DESTDIR}${BINDIR}/lprm

        install -s lpdrestart ${DESTDIR}/etc/lpdrestart
        install -s lpdrestart ${DESTDIR}/etc/lpdrestart

-       chgrp ${SPGRP} ${DESTDIR}/${LIBDIR}/lpd ${DESTDIR}/${LIBDIR}/rlpr \
-               ${DESTDIR}/${BINDIR}/lpr ${DESTDIR}/${BINDIR}/lpq \
-               ${DESTDIR}/${BINDIR}/lprm
-       chown ${DAEMON} ${DESTDIR}/${SPOOLDIR}
-       chgrp ${SPGRP} ${DESTDIR}/${SPOOLDIR}
-       chmod 775 ${DESTDIR}/${SPOOLDIR}
+       chgrp ${SPGRP} ${DESTDIR}${LIBDIR}/lpd ${DESTDIR}${LIBDIR}/rlpr \
+               ${DESTDIR}${BINDIR}/lpr ${DESTDIR}${BINDIR}/lpq \
+               ${DESTDIR}${BINDIR}/lprm
+       chown ${DAEMON} ${DESTDIR}${SPOOLDIR}
+       chgrp ${SPGRP} ${DESTDIR}${SPOOLDIR}
+       chmod 775 ${DESTDIR}${SPOOLDIR}
+       install -s vfontinfo ${DESTDIR}${LIBDIR}/vfontinfo
+       install -s vwidth ${DESTDIR}${LIBDIR}/vwidth
+       install -s pac ${DESTDIR}/etc/pac
+
+finstall: filters
+       install -s lpf ${DESTDIR}${LIBDIR}/lpf
+       install -s necf ${DESTDIR}${LIBDIR}/necf
+       install -s rvsort ${DESTDIR}${LIBDIR}/rvsort
+       install -s rvcat ${DESTDIR}${LIBDIR}/rvcat
+       install -s vsort ${DESTDIR}${LIBDIR}/vsort
+       install -s vcat ${DESTDIR}${LIBDIR}/vcat
+       install -s vpf ${DESTDIR}${LIBDIR}/vpf
+       install -s vpsf ${DESTDIR}${LIBDIR}/vpsf
+       install -s vpltdmp ${DESTDIR}${LIBDIR}/vpltdmp

 
 clean:
 
 clean:

-       rm -f ${OBJS} *.o
+       rm -f ${OBJS} ${FLTRS} *.o

 
 print:
        @pr makefile
 
 print:
        @pr makefile