X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2FMakefile.linux;h=84cd12beac1828ef6c244ad19625b7887cf7f963;hp=625d4b0ee019bfffbfbba1d95075d2b881cfdcfb;hb=e0dd0810656dd215654c6ac66d516ce873df1196;hpb=05ab4543ab743f88b7a26f17d77ce18560358fea

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 625d4b0..84cd12b 100644
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,18 +1,16 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.5 1995/04/24 06:14:56 paulus Exp $
+# $Id: Makefile.linux,v 1.14 1996/08/28 06:37:53 paulus Exp $
 #
 
-BINDIR = /usr/etc
-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 \
+	   demand.c
+HEADERS =  callout.h pathnames.h patchlevel.h chap.h md5.h chap_ms.h md4.h \
+	   ipxcp.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 sys-linux.o ipxcp.o
 
 all: pppd
 
@@ -20,39 +18,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 = -g # -O2
-VER = 0.2.8
+# DEBUG_FLAGS = -DDEBUGALL
+#
+COPTS = -O2 # -g
+VER = 2.3.0
 LIBS = -lbsd
+YACC = bison -y
+LEX = flex
 
-CFLAGS = $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS)
-SOURCE= RELNOTES Makefile.linux $(PPPDSRCS) $(HEADERS) $(MANPAGES)
+# 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=
 
-install:
-	install -c -m 4555 -o root pppd $(BINDIR)/pppd
-	install -c -m 555 -o root pppd.8 $(MANDIR)/man8
+COMPILE_FLAGS= -D_linux_=1 -DHAVE_PATHS_H -D__BSD_SOURCE
 
-pppd: $(PPPDOBJS)
-	$(CC) $(CFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
+CFLAGS= $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS) $(INCLUDE_DIRS)
 
-pppd.tar: $(SOURCE)
-	tar -cvf pppd.tar $(SOURCE)
+ifdef USE_MS_DNS
+CFLAGS   += -DUSE_MS_DNS=1
+endif
+
+ifdef IPX_CHANGE
+CFLAGS   += -DIPX_CHANGE=1
+PPPDOBJS += ipxcp.o
+endif
 
-pppd.tar.gz: pppd.tar
-	gzip pppd.tar
+ifdef HAS_SHADOW
+CFLAGS   += -DHAS_SHADOW
+LIBS     += -lshadow
+endif
+
+ifdef USE_PAM
+CFLAGS   += -DUSE_PAM
+LIBS     += -lpam -ldl
+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) # -Wl,-M >pppd.map
 
 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: