fixed "make filters"

[unix-history] / usr / src / usr.sbin / lpr / Makefile

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

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


@@ -6,7 +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
+CFLAGS=-O -DBSD41C

 LDFLAGS=
 LIBDIR=/usr/lib
 BINDIR=/usr/ucb
 LDFLAGS=
 LIBDIR=/usr/lib
 BINDIR=/usr/ucb


@@ -15,19 +16,28 @@ CXREF=/usr/ucb/ctags -x
 ROOT=root
 DAEMON=daemon
 SPGRP=daemon
 ROOT=root
 DAEMON=daemon
 SPGRP=daemon

+DESTDIR=

 
 

-all: lpd lpr lpq lprm lpdrestart filters
+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

 
 

-filters: necf lpf laf
+all:   ${OBJS}

 
 

-lpd:   lpd.o lpdchar.o printcap.o getqueue.o
-       ${CC} -o lpd ${LDFLAGS} lpd.o lpdchar.o printcap.o getqueue.o
+filters: ${FILTERS}
+
+lpd:   lpd.o lpdchar.o printcap.o getq.o
+       ${CC} -o lpd ${LDFLAGS} lpd.o lpdchar.o printcap.o getq.o -ljobs
+
+rlpr:  rlpr.o printcap.o
+       ${CC} -o rlpr ${LDFLAGS} rlpr.o printcap.o

 
 lpr:   lpr.o printcap.o
 
 lpr:   lpr.o printcap.o

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

 
 

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

 
 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


@@ -35,40 +45,33 @@ lprm:       lprm.o printcap.o
 lpdrestart: lpdrestart.o
        ${CC} -o lpdrestart ${LDFLAGS} lpdrestart.o
 
 lpdrestart: lpdrestart.o
        ${CC} -o lpdrestart ${LDFLAGS} lpdrestart.o
 

-laf:   laf.c
-       ${CC} -o laf ${CFLAGS} ${LDFLAGS} laf.c
-

 lpf:   lpf.c
        ${CC} -o lpf ${CFLAGS} ${LDFLAGS} lpf.c
 
 necf:  necf.c
        ${CC} -o necf ${CFLAGS} ${LDFLAGS} necf.c
 
 lpf:   lpf.c
        ${CC} -o lpf ${CFLAGS} ${LDFLAGS} lpf.c
 
 necf:  necf.c
        ${CC} -o necf ${CFLAGS} ${LDFLAGS} necf.c
 

-lpr.o lpd.o lpq.o lprm.o lpdrestart.o: lp.local.h
-lpd.o lpq.o getqueue.o: getqueue.h
+lpd.o rlpr.o lpr.o lpq.o lprm.o lpdrestart.o: lp.local.h
+lpd.o lpq.o getq.o: getq.h

 
 install: all
 
 install: all

-       cp lpd ${LIBDIR}/lpd
-       cp lpq ${BINDIR}/lpq
-       cp lprm ${BINDIR}/lprm
-       cp lpr ${BINDIR}/lpr
-#      rm -f ${BINDIR}/opr ${BINDIR}/print
-#      ln ${BINDIR}/lpr ${BINDIR}/print
-#      ln ${BINDIR}/lpr ${BINDIR}/opr
-       chown ${ROOT} ${BINDIR}/lpr
-       chown ${DAEMON} $(BINDIR)/lpq ${BINDIR}/lprm ${LIBDIR}/lpd
-       chgrp ${SPGRP} ${LIBDIR}/lpd ${BINDIR}/lpr ${BINDIR}/lpq ${BINDIR}/lprm
-       chmod 6711 ${LIBDIR}/lpd ${BINDIR}/lpr ${BINDIR}/lprm
-       chmod 2711 ${BINDIR}/lpq
-       chown ${DAEMON} ${SPOOLDIR}
-       chgrp ${SPGRP} ${SPOOLDIR}
-       chmod 775 ${SPOOLDIR}
+       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
+       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}

 
 clean:
 
 clean:

-       rm -f laf lprm lpq lpd lpr necf lpf *.o
+       rm -f ${OBJS} *.o

 
 print:
        @pr makefile
        @${CXREF} *.c | pr -h XREF
        @pr *.h *.c
 
 print:
        @pr makefile
        @${CXREF} *.c | pr -h XREF
        @pr *.h *.c

-