mods from Steve Perkins

[ppp.git] / pppd / Makefile.linux

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index c250dc78cd354d47e875824388332ff3c85e017e..933309697356a0dd19b90ecd09a1e62de1d405a7 100644 (file)
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,18 +1,20 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.3 1994/09/01 00:40:01 paulus Exp $
+# $Id: Makefile.linux,v 1.19 1997/03/04 03:35:05 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 lock.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
+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 lock.o sys-linux.o
+          auth.o options.o demand.o sys-linux.o ipxcp.o
 
 all: pppd
 
@@ -20,44 +22,57 @@ 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 = -I.. -D_linux_=1 -DGIDSET_TYPE=gid_t -DHAVE_PATHS_H
-COPTS = -g # -O2
-LOCKPREFIX = \"/usr/spool/uucp/LCK..\"
-VER = 0.2.8
+#
+COPTS = -O2 # -g
+VER = 2.3.0
+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
+# the default location for include files first before the .. location.
+#INCLUDE_DIRS= -I/usr/include -I..
+INCLUDE_DIRS=
 
-CFLAGS = $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS)
-SOURCE= RELNOTES Makefile.linux $(PPPDSRCS) $(HEADERS) $(MANPAGES)
+COMPILE_FLAGS= -D_linux_=1 -DHAVE_PATHS_H -DIPX_CHANGE
 
-install:
-       install -c -m 4555 -o root pppd $(BINDIR)/pppd
+CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS)
+
+ifdef CHAPMS
+CFLAGS   += -DCHAPMS=1
+LIBS     := -ldes $(LIBS)
+PPPDOBJS += md4.o chap_ms.o
+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: