removed lock.c, cleanup

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 36aac2fd2927c4cde51e2a32b3566d66c7295843..625d4b0ee019bfffbfbba1d95075d2b881cfdcfb 100644 (file)
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,18 +1,18 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.4 1994/09/21 01:49:08 paulus Exp $
+# $Id: Makefile.linux,v 1.5 1995/04/24 06:14:56 paulus Exp $
 #
 
 BINDIR = /usr/etc
 MANDIR = /usr/man
 
 PPPDSRCS = main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c md5.c ccp.c \
-       auth.c options.c lock.c sys-linux.c
+       auth.c options.c sys-linux.c
 HEADERS = callout.h pathnames.h patchlevel.h chap.h md5.h
 MANPAGES = pppd.8
 
 PPPDOBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap.o md5.o ccp.o \
-       auth.o options.o lock.o sys-linux.o
+       auth.o options.o sys-linux.o
 
 all: pppd
 
@@ -25,10 +25,10 @@ endif
 
 # CC = gcc
 DEBUG_FLAGS = -DDEBUGALL
-COMPILE_FLAGS = -I.. -D_linux_=1 -DHAVE_PATHS_H
+COMPILE_FLAGS = -D_linux_=1 -DHAVE_PATHS_H
 COPTS = -g # -O2
-LOCKPREFIX = \"/usr/spool/uucp/LCK..\"
 VER = 0.2.8
+LIBS = -lbsd
 
 CFLAGS = $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS)
 SOURCE= RELNOTES Makefile.linux $(PPPDSRCS) $(HEADERS) $(MANPAGES)
@@ -53,11 +53,6 @@ depend:
        $(CPP) -M $(CFLAGS) $(PPPDSRCS) >.depend
 
 options.o:     options.c
-       $(CC) -c -o options.o $(CFLAGS) \
-       "-DIMPLEMENTATION=\" (Linux $(VER))\"" options.c
-
-lock.o: lock.c
-       $(CC) -c -o lock.o $(CFLAGS) -DPIDSTRING=1 -DLOCK_DIR=1 \
-       "-DLOCK_PREFIX=$(LOCKPREFIX)" lock.c
+       $(CC) -c -o options.o $(CFLAGS) options.c
 
 saber_pppd:

diff --git a/pppd/Makefile.sun b/pppd/Makefile.sun
index 4938de2da1ddd9bbd229f914909edb09ae75da9d..5afb9468b1dd2e04dd9882f8a9495ed929160322 100644 (file)
--- a/pppd/Makefile.sun
+++ b/pppd/Makefile.sun
@@ -1,22 +1,22 @@
 #
 # pppd makefile for Suns
-# $Id: Makefile.sun,v 1.7 1994/08/21 23:44:13 paulus Exp $
+# $Id: Makefile.sun,v 1.8 1995/04/24 06:14:29 paulus Exp $
 #
 
 BINDIR = /usr/local/etc
 MANDIR = /usr/local/man
 
 PPPDSRCS = main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c md5.c ccp.c \
-       auth.c options.c lock.c sys-bsd.c sys-str.c sys-ultrix.c sys-linux.c
+       auth.c options.c sys-bsd.c sys-str.c sys-ultrix.c sys-linux.c
 HEADERS = callout.h pathnames.h patchlevel.h chap.h md5.h
 MANPAGES = pppd.8
 
 PPPDOBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap.o md5.o ccp.o \
-       auth.o options.o lock.o sys-str.o
+       auth.o options.o sys-str.o
 
 # CC = gcc
 DEBUG_FLAGS =
-COMPILE_FLAGS = -DSTREAMS -DGIDSET_TYPE=int
+COMPILE_FLAGS =
 COPTS = -O
 LIBS = -lkvm
 
@@ -34,12 +34,6 @@ install:
 pppd: $(PPPDOBJS)
        $(CC) $(CFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
 
-pppd.tar: $(SOURCE)
-       tar -cvf pppd.tar $(SOURCE)
-
-pppd.tar.Z: pppd.tar
-       compress pppd.tar
-
 clean:
        rm -f $(PPPDOBJS) pppd *~ #* core
 
@@ -47,9 +41,3 @@ depend:
        cpp -M $(CFLAGS) $(PPPDSRCS) >.depend
 #      makedepend $(CFLAGS) $(PPPDSRCS)
 
-saber_pppd:
-       #setopt load_flags $(CFLAGS)
-       #setopt ansi
-       #suppress 452 md5.c
-       #load $(PPPDSRCS)
-