X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2FMakefile.linux;h=933309697356a0dd19b90ecd09a1e62de1d405a7;hp=13d9a1b3f3de7fa7440c89bb8ff0fde5bcedd22e;hb=3278b141bac31dce7c1e45136a3c85e07dee6815;hpb=eda6d3a9f0b97d7220ba38333806978f337e6d46

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 13d9a1b..9333096 100644
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,13 +1,17 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.13 1996/07/01 01:05:27 paulus Exp $
+# $Id: Makefile.linux,v 1.19 1997/03/04 03:35:05 paulus Exp $
 #
 
+# 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 ccp.c \
-	   ipxcp.c auth.c options.c sys-linux.c md4.c chap_ms.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
+	   ipxcp.h cbcp.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 demand.o sys-linux.o ipxcp.o
@@ -21,13 +25,10 @@ include .depend
 endif
 
 # CC = gcc
-# DEBUG_FLAGS = -DDEBUGALL
 #
 COPTS = -O2 # -g
 VER = 2.3.0
-LIBS = -lbsd
-YACC = bison -y
-LEX = flex
+LIBS = -lcrypt -lbsd
 
 # 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
@@ -35,27 +36,31 @@ LEX = flex
 #INCLUDE_DIRS= -I/usr/include -I..
 INCLUDE_DIRS=
 
-COMPILE_FLAGS= -D_linux_=1 -DHAVE_PATHS_H
-  
-CFLAGS= $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS) $(INCLUDE_DIRS)
+COMPILE_FLAGS= -D_linux_=1 -DHAVE_PATHS_H -DIPX_CHANGE
 
-ifdef USE_MS_DNS
-CFLAGS   += -DUSE_MS_DNS=1
-endif
+CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS)
 
-ifdef IPX_CHANGE
-CFLAGS   += -DIPX_CHANGE=1
-PPPDOBJS += ipxcp.o
+ifdef CHAPMS
+CFLAGS   += -DCHAPMS=1
+LIBS     := -ldes $(LIBS)
+PPPDOBJS += md4.o chap_ms.o
 endif
 
 ifdef HAS_SHADOW
 CFLAGS   += -DHAS_SHADOW
-LIBS     += -lshadow
+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     := -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
@@ -64,7 +69,7 @@ install: pppd
 	install -c -m 555 -o root pppd.8 $(MANDIR)/man8
 
 pppd: $(PPPDOBJS)
-	$(CC) $(CFLAGS) -o pppd $(PPPDOBJS) $(LIBS) # -Wl,-M >pppd.map
+	$(CC) $(CFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
 
 clean:
 	rm -f $(PPPDOBJS) pppd *~ #* core