update to Al's 2.2.0f

[ppp.git] / pppd / Makefile.linux

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index a3936b8cd434a5d4521816148c7a972d7158361f..a6c3003cb46c94fb6771dda6ec7d71dfd71ac81f 100644 (file)
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,18 +1,15 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.2 1994/05/24 11:31:54 paulus Exp $
+# $Id: Makefile.linux,v 1.12 1996/05/28 00:53:30 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 \
-       auth.c options.c lock.c sys-linux.c
-HEADERS = callout.h pathnames.h patchlevel.h chap.h md5.h
+PPPDSRCS = main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c md5.c ccp.c \
+          ipxcp.c auth.c options.c sys-linux.c md4.c chap_ms.c
+HEADERS =  callout.h pathnames.h patchlevel.h chap.h md5.h chap_ms.h md4.h \
+          ipxcp.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
+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-linux.o ipxcp.o
 
 all: pppd
 
@@ -24,41 +21,38 @@ HEADERS := $(HEADERS) .depend
 endif
 
 # CC = gcc
-# SECURE_FLAGS = -DREQ_SYSOPTIONS=1
-DEBUG_FLAGS = -DDEBUGALL
-COMPILE_FLAGS = -I.. -D_linux_=1 -DGIDSET_TYPE=gid_t
-COPTS = -g # -O2
-LOCKPREFIX = \"/usr/spool/uucp/LCK..\"
+# DEBUG_FLAGS = -DDEBUGALL
+COMPILE_FLAGS = -D_linux_=1 -DHAVE_PATHS_H
+COPTS = -O2 # -g
 VER = 0.2.8
+LIBS = -lbsd
 
-CFLAGS = $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS) $(SECURE_FLAGS)
-SOURCE= RELNOTES Makefile.linux $(PPPDSRCS) $(HEADERS) $(MANPAGES)
+CFLAGS= $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS)
 
-install:
-       install -c -m 4555 -o root pppd $(BINDIR)/pppd
-       install -c -m 555 -o root pppd.8 $(MANDIR)/man8
+ifdef USE_MS_DNS
+CFLAGS   += -DUSE_MS_DNS=1
+endif
 
-pppd: $(PPPDOBJS)
-       $(CC) $(CFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
+ifdef IPX_CHANGE
+CFLAGS   += -DIPX_CHANGE=1
+PPPDOBJS += ipxcp.o
+endif
 
-pppd.tar: $(SOURCE)
-       tar -cvf pppd.tar $(SOURCE)
+ifdef HAS_SHADOW
+CFLAGS   += -DHAS_SHADOW
+LIBS     += -lshadow
+endif
 
-pppd.tar.gz: pppd.tar
-       gzip pppd.tar
+install: pppd
+       mkdir -p $(BINDIR) $(MANDIR)
+       install -s -c -m 4555 -o root pppd $(BINDIR)/pppd
+       install -c -m 555 -o root pppd.8 $(MANDIR)/man8
+
+pppd: $(PPPDOBJS)
+       $(CC) $(CFLAGS) -o pppd $(PPPDOBJS) $(LIBS) # -Wl,-M >pppd.map
 
 clean:
        rm -f $(PPPDOBJS) pppd *~ #* core
 
 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: