X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2FMakefile.linux;h=67c012cb10c794ffbbc1dcd6fe3886d49a485ef2;hp=625d4b0ee019bfffbfbba1d95075d2b881cfdcfb;hb=31b4bba68d46b38119fd8620ee09ff7f8831f4b5;hpb=05ab4543ab743f88b7a26f17d77ce18560358fea

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 625d4b0..67c012c 100644
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,18 +1,20 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.5 1995/04/24 06:14:56 paulus Exp $
+# $Id: Makefile.linux,v 1.32 1999/08/12 03:59:07 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 ccp.c \
-	auth.c options.c sys-linux.c
-HEADERS = callout.h pathnames.h patchlevel.h chap.h md5.h
+	   ipxcp.c auth.c options.c sys-linux.c md4.c chap_ms.c cbcp.c \
+	   demand.c utils.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 ccp.o \
-	auth.o options.o sys-linux.o
+	   auth.o options.o demand.o utils.o sys-linux.o ipxcp.o
 
 all: pppd
 
@@ -20,39 +22,82 @@ 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 = -g # -O2
-VER = 0.2.8
-LIBS = -lbsd
+#
+COPTS = -O2 -pipe -Wall -g
+LIBS =
 
-CFLAGS = $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS)
-SOURCE= RELNOTES Makefile.linux $(PPPDSRCS) $(HEADERS) $(MANPAGES)
+ifneq ($(wildcard /usr/lib/libcrypt*),)
+LIBS += -lcrypt
+endif
 
-install:
-	install -c -m 4555 -o root pppd $(BINDIR)/pppd
-	install -c -m 555 -o root pppd.8 $(MANDIR)/man8
+# Uncomment the next 2 lines to include support for Microsoft's
+# MS-CHAP authentication protocol.
+CHAPMS=y
+USE_CRYPT=y
+ifneq ($(wildcard /usr/lib/libcrypt*),)
+HAVE_CRYPT_H=y
+endif
 
-pppd: $(PPPDOBJS)
-	$(CC) $(CFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
 
-pppd.tar: $(SOURCE)
-	tar -cvf pppd.tar $(SOURCE)
+HAS_SHADOW=y
+#USE_PAM=y
+
+INCLUDE_DIRS= -I../include
+
+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
+ifneq ($(wildcard /usr/include/crypt.h),)
+CFLAGS   += -DHAVE_CRYPT_H=1
+endif
+endif
+PPPDOBJS += md4.o chap_ms.o
+ifdef MSLANMAN
+CFLAGS   += -DMSLANMAN=1
+endif
+endif
+
+ifdef HAS_SHADOW
+CFLAGS   += -DHAS_SHADOW
+#LIBS     := -lshadow $(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
 
-pppd.tar.gz: pppd.tar
-	gzip pppd.tar
+INSTALL= install -o root
+
+install: pppd
+	mkdir -p $(BINDIR) $(MANDIR)
+	$(INSTALL) -s -c -m 4550 pppd $(BINDIR)/pppd
+	if ! chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
+	  chmod o+rx $(BINDIR)/pppd; fi
+	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)/man8
+
+pppd: $(PPPDOBJS)
+	$(CC) $(CFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
 
 clean:
 	rm -f $(PPPDOBJS) pppd *~ #* core
 
 depend:
 	$(CPP) -M $(CFLAGS) $(PPPDSRCS) >.depend
-
-options.o:	options.c
-	$(CC) -c -o options.o $(CFLAGS) options.c
-
-saber_pppd: