X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2FMakefile.linux;h=b67d8541184b1768ae4ea8d096ac9571ff2d8b3c;hp=d9a1364f9389ae1ff07b5bdb523c4ddc3aec7c9b;hb=0f61ac5460e89dd768f1fb56fbdd8fa6f8af79f1;hpb=dd0be651886e784c52772f29da4955a0b0e3f61e

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index d9a1364..b67d854 100644
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,18 +1,15 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.1 1994/05/24 11:29:16 paulus Exp $
+# $Id: Makefile.linux,v 1.10 1995/12/18 03:32:57 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 \
-	auth.c options.c lock.c sys-linux.c logwtmp.c
+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 ipxcp.c
 HEADERS = callout.h pathnames.h patchlevel.h chap.h md5.h
 MANPAGES = pppd.8
 
-PPPDOBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap.o md5.o \
-	auth.o options.o lock.o sys-linux.o logwtmp.o
+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 ipxcp.o
 
 all: pppd
 
@@ -24,22 +21,22 @@ HEADERS := $(HEADERS) .depend
 endif
 
 # CC = gcc
-# SECURE_FLAGS = -DREQ_SYSOPTIONS=1
-DEBUG_FLAGS = -DDEBUGALL
-COMPILE_FLAGS = -I.. -D_linux_=1 -DGIDSET_TYPE=gid_t
+# DEBUG_FLAGS = -DDEBUGALL
+COMPILE_FLAGS = -D_linux_=1 -DHAVE_PATHS_H # -DUSE_MS_DNS=1 # -DIPX_CHANGE=1
 COPTS = -g # -O2
-LOCKPREFIX = \"/usr/spool/uucp/LCK..\"
 VER = 0.2.8
+LIBS = -lbsd
 
-CFLAGS = $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS) $(SECURE_FLAGS)
+CFLAGS= $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS)
 SOURCE= RELNOTES Makefile.linux $(PPPDSRCS) $(HEADERS) $(MANPAGES)
 
-install:
+install: pppd
+	mkdir -p $(BINDIR)
 	install -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)
+	$(CC) $(CFLAGS) -o pppd $(PPPDOBJS) $(LIBS) # -Wl,-M >pppd.map
 
 pppd.tar: $(SOURCE)
 	tar -cvf pppd.tar $(SOURCE)
@@ -52,13 +49,3 @@ clean:
 
 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: