From 099f04ce0be952f0742d712ae7ac6581b976ae0e Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Thu, 4 Apr 1996 03:25:09 +0000 Subject: [PATCH] added files for demand-dialling and packet filtering; cleanup --- pppd/Makefile.NeXT | 26 +++++--------------------- pppd/Makefile.aix4 | 28 +++++++--------------------- pppd/Makefile.linux | 18 +++++------------- pppd/Makefile.osf | 16 ++++++---------- pppd/Makefile.ultrix | 19 +++++-------------- 5 files changed, 28 insertions(+), 79 deletions(-) diff --git a/pppd/Makefile.NeXT b/pppd/Makefile.NeXT index 8ded259..2f025e7 100644 --- a/pppd/Makefile.NeXT +++ b/pppd/Makefile.NeXT @@ -2,7 +2,7 @@ # pppd makefile for NeXT # # $Orignial: Makefile.ultrix,v 1.4 1994/09/01 00:40:40 paulus Exp $ -# $Id: Makefile.NeXT,v 1.2 1995/12/18 03:30:45 paulus Exp $ +# $Id: Makefile.NeXT,v 1.3 1996/04/04 03:25:04 paulus Exp $ # #ARCHFLAGS = -arch i386 -arch m68k -arch hppa -arch sparc @@ -13,13 +13,12 @@ BINDIR = /usr/local/ppp/bin MANDIR = /usr/local/ppp/man PPPDSRCS = main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c md5.c ccp.c \ - auth.c options.c sys-bsd.c sys-str.c sys-ultrix.c \ - sys-linux.c lock.c -HEADERS = callout.h pathnames.h patchlevel.h chap.h md5.h -MANPAGES = pppd.8 + auth.c options.c demand.c sys-NeXT.c \ + gencode.c grammar.c scanner.c nametoaddr.c optimize.c PPPDOBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap.o md5.o ccp.o \ - auth.o options.o sys-NeXT.o + auth.o options.o demand.o sys-NeXT.o \ + gencode.o grammar.o scanner.o nametoaddr.o optimize.o # CC = gcc DEBUG_FLAGS = -O -posix $(ARCHFLAGS) @@ -55,9 +54,6 @@ LIBS = CFLAGS = -I../NeXT -I.. $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS) -SOURCE= RELNOTES Makefile \ - $(PPPDSRCS) $(HEADERS) $(MANPAGES) - all: pppd install: @@ -68,12 +64,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 @@ -81,9 +71,3 @@ depend: cpp -M $(CFLAGS) $(PPPDSRCS) >.depend # makedepend $(CFLAGS) $(PPPDSRCS) -saber_pppd: - #setopt load_flags $(CFLAGS) - #setopt ansi - #suppress 452 md5.c - #load $(PPPDSRCS) - diff --git a/pppd/Makefile.aix4 b/pppd/Makefile.aix4 index 77cc533..abeeb25 100644 --- a/pppd/Makefile.aix4 +++ b/pppd/Makefile.aix4 @@ -1,6 +1,6 @@ # # pppd makefile for AIX 4.1 -# $Id: Makefile.aix4,v 1.1 1994/12/12 00:40:06 paulus Exp $ +# $Id: Makefile.aix4,v 1.2 1996/04/04 03:25:06 paulus Exp $ # #ifndef BINDIR BINDIR = /usr/sbin @@ -9,13 +9,13 @@ BINDIR = /usr/sbin MANDIR = /usr/man #ENDIF -PPPDSRCS = main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c md5.c \ - auth.c options.c sys-bsd.c sys-str.c sys-aix4.c ccp.c -HEADERS = callout.h pathnames.h patchlevel.h chap.h md5.h -MANPAGES = pppd.8 +PPPDSRCS = main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c md5.c ccp.c \ + auth.c options.c demand.c sys-aix4.c \ + gencode.c grammar.c scanner.c nametoaddr.c optimize.c -PPPDOBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap.o md5.o \ - auth.o options.o sys-aix4.o ccp.o +PPPDOBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap.o md5.o ccp.o \ + auth.o options.o demand.o sys-aix4.o \ + gencode.o grammar.o scanner.o nametoaddr.o optimize.o CC = xlc DEBUG_FLAGS = -DDEBUGALL @@ -27,9 +27,6 @@ LOCK_PREFIX=\"/var/locks/LCK..\" CFLAGS = -I.. $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS) $(SECURE_FLAGS) -SOURCE= RELNOTES Makefile \ - $(PPPDSRCS) $(HEADERS) $(MANPAGES) - all: pppd pppd: $(PPPDOBJS) @@ -42,20 +39,9 @@ install: all 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 depend: cpp -M $(CFLAGS) $(PPPDSRCS) >.depend # makedepend $(CFLAGS) $(PPPDSRCS) - -lock.o: lock.c - $(CC) -c -o lock.o $(CFLAGS) -DLOCK_DIR=1 -DPIDSTRING=1 \ --DLOCK_PREFIX=$(LOCK_PREFIX) lock.c - diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux index b67d854..3885390 100644 --- a/pppd/Makefile.linux +++ b/pppd/Makefile.linux @@ -1,15 +1,15 @@ # # pppd makefile for Linux -# $Id: Makefile.linux,v 1.10 1995/12/18 03:32:57 paulus Exp $ +# $Id: Makefile.linux,v 1.11 1996/04/04 03:25:07 paulus Exp $ # 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 ipxcp.c -HEADERS = callout.h pathnames.h patchlevel.h chap.h md5.h -MANPAGES = pppd.8 + auth.c options.c demand.c sys-linux.c ipxcp.c \ + gencode.c grammar.c scanner.c nametoaddr.c optimize.c 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 ipxcp.o + auth.o options.o demand.o sys-linux.o ipxcp.o \ + gencode.o grammar.o scanner.o nametoaddr.o optimize.o all: pppd @@ -17,7 +17,6 @@ all: pppd # include dependancies if present and backup if as a header file ifeq (.depend,$(wildcard .depend)) include .depend -HEADERS := $(HEADERS) .depend endif # CC = gcc @@ -28,7 +27,6 @@ VER = 0.2.8 LIBS = -lbsd CFLAGS= $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS) -SOURCE= RELNOTES Makefile.linux $(PPPDSRCS) $(HEADERS) $(MANPAGES) install: pppd mkdir -p $(BINDIR) @@ -38,12 +36,6 @@ install: pppd pppd: $(PPPDOBJS) $(CC) $(CFLAGS) -o pppd $(PPPDOBJS) $(LIBS) # -Wl,-M >pppd.map -pppd.tar: $(SOURCE) - tar -cvf pppd.tar $(SOURCE) - -pppd.tar.gz: pppd.tar - gzip pppd.tar - clean: rm -f $(PPPDOBJS) pppd *~ #* core diff --git a/pppd/Makefile.osf b/pppd/Makefile.osf index a9af3f0..87d141b 100644 --- a/pppd/Makefile.osf +++ b/pppd/Makefile.osf @@ -1,31 +1,27 @@ # # pppd makefile for OSF/1 on DEC Alpha -# $Id: Makefile.osf,v 1.3 1995/06/01 01:30:14 paulus Exp $ +# $Id: Makefile.osf,v 1.4 1996/04/04 03:25:08 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 sys-bsd.c sys-str.c sys-ultrix.c sys-linux.c \ - sys-osf.c -HEADERS = callout.h pathnames.h patchlevel.h chap.h md5.h -MANPAGES = pppd.8 + auth.c options.c demand.c sys-osf.c \ + gencode.c grammar.c scanner.c nametoaddr.c optimize.c PPPDOBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap.o md5.o ccp.o \ - auth.o options.o sys-osf.o + auth.o options.o demand.o sys-osf.o \ + gencode.o grammar.o scanner.o nametoaddr.o optimize.o CC = cc DEBUG_FLAGS = -DDEBUGALL -COMPILE_FLAGS = -DSTREAMS -DGIDSET_TYPE=int +COMPILE_FLAGS = -DSTREAMS -DGIDSET_TYPE=int -D_SOCKADDR_LEN COPTS = -O2 LIBS = CFLAGS = -I.. $(COPTS) $(COMPILE_FLAGS) -SOURCE= RELNOTES Makefile \ - $(PPPDSRCS) $(HEADERS) $(MANPAGES) - all: pppd install: pppd diff --git a/pppd/Makefile.ultrix b/pppd/Makefile.ultrix index 58de2bc..144ae28 100644 --- a/pppd/Makefile.ultrix +++ b/pppd/Makefile.ultrix @@ -1,18 +1,18 @@ # # pppd makefile for Ultrix -# $Id: Makefile.ultrix,v 1.5 1995/04/28 04:33:21 paulus Exp $ +# $Id: Makefile.ultrix,v 1.6 1996/04/04 03:25:09 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 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 + auth.c options.c demand.c sys-ultrix.c \ + gencode.c grammar.c scanner.c nametoaddr.c optimize.c PPPDOBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap.o md5.o ccp.o \ - auth.o options.o sys-ultrix.o + auth.o options.o demand.o sys-ultrix.o \ + gencode.o grammar.o scanner.o nametoaddr.o optimize.o # CC = gcc DEBUG_FLAGS = @@ -22,9 +22,6 @@ LIBS = CFLAGS = -I.. $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS) -SOURCE= RELNOTES Makefile \ - $(PPPDSRCS) $(HEADERS) $(MANPAGES) - all: pppd install: pppd @@ -34,12 +31,6 @@ install: pppd 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 -- 2.39.2