X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2FMakefile.linux;h=1d5e75e7e31b5672a909bbebb1aff3c1d67870ed;hp=d9a1364f9389ae1ff07b5bdb523c4ddc3aec7c9b;hb=96dad36e1d37716004171559280613739e7df29e;hpb=dd0be651886e784c52772f29da4955a0b0e3f61e

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index d9a1364..1d5e75e 100644
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,18 +1,20 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.1 1994/05/24 11:29:16 paulus Exp $
+# $Id: Makefile.linux,v 1.21 1997/07/14 03:52:08 paulus Exp $
 #
 
-BINDIR = /usr/etc
+# Default installation locations
+BINDIR = /usr/sbin
 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
-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 cbcp.c \
+	   demand.c
+HEADERS =  callout.h pathnames.h patchlevel.h chap.h md5.h chap_ms.h md4.h \
+	   ipxcp.h cbcp.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 demand.o sys-linux.o ipxcp.o
 
 all: pppd
 
@@ -20,45 +22,68 @@ 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
-# 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..\"
-VER = 0.2.8
-
-CFLAGS = $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS) $(SECURE_FLAGS)
-SOURCE= RELNOTES Makefile.linux $(PPPDSRCS) $(HEADERS) $(MANPAGES)
-
-install:
-	install -c -m 4555 -o root pppd $(BINDIR)/pppd
+#
+COPTS = -O2 # -g
+VER = 2.3.1
+LIBS =
+
+ifneq ($(wildcard /usr/lib/libcrypt*),)
+LIBS += -lcrypt
+endif
+
+# The INCLUDE_DIRS must include the standard headers before the local
+# ones. If you just had -I.. then the order would be reversed. So, use
+# the default location for include files first before the .. location.
+#INCLUDE_DIRS= -I/usr/include -I..
+INCLUDE_DIRS=
+
+COMPILE_FLAGS= -D_linux_=1 -DHAVE_PATHS_H -DIPX_CHANGE
+
+CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS)
+
+ifdef CHAPMS
+CFLAGS   += -DCHAPMS=1
+ifndef USE_CRYPT
+LIBS     := -ldes $(LIBS)
+else
+CFLAGS   += -DUSE_CRYPT=1
+endif
+PPPDOBJS += md4.o chap_ms.o
+ifdef MSLANMAN
+CFLAGS   += -DMSLANMAN=1
+endif
+endif
+
+ifdef HAS_SHADOW
+CFLAGS   += -DHAS_SHADOW
+LIBS     := -lshadow -lcrypt $(LIBS)
+endif
+
+# For "Pluggable Authentication Modules", see ftp.redhat.com:/pub/pam/.
+ifdef USE_PAM
+CFLAGS   += -DUSE_PAM
+LIBS     := -lpam -ldl $(LIBS)
+endif
+
+# Lock library binary for Linux is included in 'linux' subdirectory.
+ifdef LOCKLIB
+LIBS     := -llock $(LIBS)
+CFLAGS   += -DLOCKLIB=1
+endif
+
+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)
 
-pppd.tar: $(SOURCE)
-	tar -cvf pppd.tar $(SOURCE)
-
-pppd.tar.gz: pppd.tar
-	gzip pppd.tar
-
 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: