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

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index a6c3003..1d5e75e 100644
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,12 +1,17 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.12 1996/05/28 00:53:30 paulus Exp $
+# $Id: Makefile.linux,v 1.21 1997/07/14 03:52:08 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
@@ -17,30 +22,56 @@ 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
-# 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)
+VER = 2.3.1
+LIBS =
 
-ifdef USE_MS_DNS
-CFLAGS   += -DUSE_MS_DNS=1
+ifneq ($(wildcard /usr/lib/libcrypt*),)
+LIBS += -lcrypt
 endif
 
-ifdef IPX_CHANGE
-CFLAGS   += -DIPX_CHANGE=1
-PPPDOBJS += ipxcp.o
+# 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
+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
@@ -49,7 +80,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