merge rrestor and restor

SCCS-vsn: sbin/restore/Makefile 4.2

diff --git a/usr/src/sbin/restore/Makefile b/usr/src/sbin/restore/Makefile
index 44881b3..2974850 100644 (file)
--- a/usr/src/sbin/restore/Makefile
+++ b/usr/src/sbin/restore/Makefile
@@ -1,6 +1,6 @@
 # Copyright (c) 1982 Regents of the University of California
 #
 # Copyright (c) 1982 Regents of the University of California
 #

-#      @(#)Makefile    4.1     (Berkeley)      %G%
+#      @(#)Makefile    4.2     (Berkeley)      %G%

 #
 NETSER=        /usr/src/ucb/netser
 
 #
 NETSER=        /usr/src/ucb/netser
 


@@ -9,19 +9,16 @@ CFLAGS=
 
 all: rrestor restor
 
 
 all: rrestor restor
 

+restor: restor.c
+       cc -o restor restor.c
+

 rrestor: ${OBJS} rrestor.o
        cc -o rrestor ${OBJS} rrestor.o -ljobs
 
 rrestor: ${OBJS} rrestor.o
        cc -o rrestor ${OBJS} rrestor.o -ljobs
 

-restor: ${OBJS} restor.o
-       cc -o restor ${OBJS} restor.o -ljobs
-

 rrestor.o: restor.c
        cc -c -DRRESTOR restor.c
        mv restor.o rrestor.o
 
 rrestor.o: restor.c
        cc -c -DRRESTOR restor.c
        mv restor.o rrestor.o
 

-restor.o: restor.c
-       cc -c restor.c
-

 install: rrestor restor
        cp rrestor /etc
        cp restor /etc
 install: rrestor restor
        cp rrestor /etc
        cp restor /etc