Mods to Linux code from Al Longyear: use ppp_idle instead of

[ppp.git] / pppd / Makefile.linux

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index d9a1364f9389ae1ff07b5bdb523c4ddc3aec7c9b..507f89c6d7efde95795152077ac421cb62a70eea 100644 (file)
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,18 +1,18 @@
 #
 # pppd makefile for Linux
 #
 # pppd makefile for Linux

-# $Id: Makefile.linux,v 1.1 1994/05/24 11:29:16 paulus Exp $
+# $Id: Makefile.linux,v 1.8 1995/06/30 01:47:13 paulus Exp $

 #
 
 #
 

-BINDIR = /usr/etc
+BINDIR = /usr/lib/ppp

 MANDIR = /usr/man
 
 MANDIR = /usr/man
 

-PPPDSRCS = main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c md5.c \
-       auth.c options.c lock.c sys-linux.c logwtmp.c
+PPPDSRCS = main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c md5.c ccp.c \
+       auth.c options.c sys-linux.c

 HEADERS = callout.h pathnames.h patchlevel.h chap.h md5.h
 MANPAGES = pppd.8
 
 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 \
-       auth.o options.o lock.o sys-linux.o logwtmp.o
+PPPDOBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap.o md5.o ccp.o \
+       auth.o options.o sys-linux.o

 
 all: pppd
 
 
 all: pppd
 


@@ -24,17 +24,17 @@ HEADERS := $(HEADERS) .depend
 endif
 
 # CC = gcc
 endif
 
 # CC = gcc

-# SECURE_FLAGS = -DREQ_SYSOPTIONS=1
-DEBUG_FLAGS = -DDEBUGALL
-COMPILE_FLAGS = -I.. -D_linux_=1 -DGIDSET_TYPE=gid_t
+# DEBUG_FLAGS = -DDEBUGALL
+COMPILE_FLAGS = -D_linux_=1 -DHAVE_PATHS_H

 COPTS = -g # -O2
 COPTS = -g # -O2

-LOCKPREFIX = \"/usr/spool/uucp/LCK..\"

 VER = 0.2.8
 VER = 0.2.8

+LIBS = -lbsd

 
 

-CFLAGS = $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS) $(SECURE_FLAGS)
+CFLAGS = $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS)

 SOURCE= RELNOTES Makefile.linux $(PPPDSRCS) $(HEADERS) $(MANPAGES)
 
 SOURCE= RELNOTES Makefile.linux $(PPPDSRCS) $(HEADERS) $(MANPAGES)
 

-install:
+install: pppd
+       mkdir -p $(BINDIR)

        install -c -m 4555 -o root pppd $(BINDIR)/pppd
        install -c -m 555 -o root pppd.8 $(MANDIR)/man8
 
        install -c -m 4555 -o root pppd $(BINDIR)/pppd
        install -c -m 555 -o root pppd.8 $(MANDIR)/man8
 


@@ -52,13 +52,3 @@ clean:
 
 depend:
        $(CPP) -M $(CFLAGS) $(PPPDSRCS) >.depend
 
 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
-
-saber_pppd: