From 6f099903b36ddcca0a85753549dad910e47a9734 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Wed, 25 Mar 1998 01:27:09 +0000 Subject: [PATCH] include from ../include instead of .. --- pppd/Makefile.NeXT | 8 +++++--- pppd/Makefile.aix4 | 4 ++-- pppd/Makefile.bsd | 4 ++-- pppd/Makefile.linux | 23 +++++++++++------------ pppd/Makefile.netbsd-1.2 | 2 +- pppd/Makefile.osf | 4 ++-- pppd/Makefile.sol2 | 4 ++-- pppd/Makefile.sunos4 | 4 ++-- pppd/Makefile.svr4 | 4 ++-- pppd/Makefile.ultrix | 4 ++-- 10 files changed, 31 insertions(+), 30 deletions(-) diff --git a/pppd/Makefile.NeXT b/pppd/Makefile.NeXT index c6fb6d9..a2cb74b 100644 --- a/pppd/Makefile.NeXT +++ b/pppd/Makefile.NeXT @@ -2,7 +2,7 @@ # pppd makefile for NeXT # # $Orignial: Makefile.ultrix,v 1.4 1994/09/01 00:40:40 paulus Exp $ -# $Id: Makefile.NeXT,v 1.4 1997/03/04 03:34:48 paulus Exp $ +# $Id: Makefile.NeXT,v 1.5 1998/03/25 01:26:57 paulus Exp $ # ARCHFLAGS = @@ -36,10 +36,12 @@ COMPILE_FLAGS = -DNO_DRAND48 \ # library is installed, uncomment the following. #LIBS = -ldes +LIBS = ../NeXT/libposix/libposix.o + -COPTS = $(ARCHFLAGS) -O -posix +COPTS = $(ARCHFLAGS) -O -D_POSIX_SOURCE -CFLAGS = $(COPTS) $(COMPILE_FLAGS) -I.. +CFLAGS = $(COPTS) $(COMPILE_FLAGS) -I../include all: pppd diff --git a/pppd/Makefile.aix4 b/pppd/Makefile.aix4 index abeeb25..a430f87 100644 --- a/pppd/Makefile.aix4 +++ b/pppd/Makefile.aix4 @@ -1,6 +1,6 @@ # # pppd makefile for AIX 4.1 -# $Id: Makefile.aix4,v 1.2 1996/04/04 03:25:06 paulus Exp $ +# $Id: Makefile.aix4,v 1.3 1998/03/25 01:26:59 paulus Exp $ # #ifndef BINDIR BINDIR = /usr/sbin @@ -25,7 +25,7 @@ COPTS = -O LIBS= -bI:/lib/pse.exp LOCK_PREFIX=\"/var/locks/LCK..\" -CFLAGS = -I.. $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS) $(SECURE_FLAGS) +CFLAGS = -I ../include $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS) $(SECURE_FLAGS) all: pppd diff --git a/pppd/Makefile.bsd b/pppd/Makefile.bsd index a1f6b84..b77cbce 100644 --- a/pppd/Makefile.bsd +++ b/pppd/Makefile.bsd @@ -1,10 +1,10 @@ -# $Id: Makefile.bsd,v 1.13 1996/10/08 04:33:33 paulus Exp $ +# $Id: Makefile.bsd,v 1.14 1998/03/25 01:27:00 paulus Exp $ BINDIR?= /usr/sbin # -D_BITYPES is for FreeBSD, which doesn't define anything to # tell us that u_int32_t gets defined if is included. # Remove for older *BSD systems for which this isn't true. -CFLAGS+= -g -I.. -DHAVE_PATHS_H -D_BITYPES +CFLAGS+= -g -I../include -DHAVE_PATHS_H -D_BITYPES PROG= pppd SRCS= main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c md5.c ccp.c \ diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux index 1bf7b1a..9a96c9a 100644 --- a/pppd/Makefile.linux +++ b/pppd/Makefile.linux @@ -1,6 +1,6 @@ # # pppd makefile for Linux -# $Id: Makefile.linux,v 1.23 1998/02/04 01:39:24 paulus Exp $ +# $Id: Makefile.linux,v 1.24 1998/03/25 01:27:01 paulus Exp $ # # Default installation locations @@ -26,8 +26,8 @@ endif # CC = gcc # -COPTS = -O2 # -g -VER = 2.3.3 +COPTS = -O2 -pipe -Wall -g +VER = 2.3.4 LIBS = ifneq ($(wildcard /usr/lib/libcrypt*),) @@ -36,14 +36,13 @@ endif # Uncomment the next 2 lines to include support for Microsoft's # MS-CHAP authentication protocol. -#CHAPMS=y -#USE_CRYPT=y +CHAPMS=y +USE_CRYPT=y -# 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= +HAS_SHADOW=y +#USE_PAM=y + +INCLUDE_DIRS= -I../include COMPILE_FLAGS= -D_linux_=1 -DHAVE_PATHS_H -DIPX_CHANGE @@ -64,7 +63,7 @@ endif ifdef HAS_SHADOW CFLAGS += -DHAS_SHADOW -LIBS := -lshadow $(LIBS) +#LIBS := -lshadow $(LIBS) endif # For "Pluggable Authentication Modules", see ftp.redhat.com:/pub/pam/. @@ -82,7 +81,7 @@ 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 + install -c -m 444 -o root pppd.8 $(MANDIR)/man8 pppd: $(PPPDOBJS) $(CC) $(CFLAGS) -o pppd $(PPPDOBJS) $(LIBS) diff --git a/pppd/Makefile.netbsd-1.2 b/pppd/Makefile.netbsd-1.2 index 10ffe8f..d10dfac 100644 --- a/pppd/Makefile.netbsd-1.2 +++ b/pppd/Makefile.netbsd-1.2 @@ -14,7 +14,7 @@ BINOWN= root LDADD= -lpcap -lcrypt -lutil DPADD= ${LIBPCAP} ${LIBCRYPT} ${LIBUTIL} -CFLAGS+= -I. -DHAVE_PATHS_H -I${PCAPDIR} -DPPP_FILTER +CFLAGS+= -I. -I../include -DHAVE_PATHS_H -I${PCAPDIR} -DPPP_FILTER #CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes -Dlint .include diff --git a/pppd/Makefile.osf b/pppd/Makefile.osf index 8181d44..2af708f 100644 --- a/pppd/Makefile.osf +++ b/pppd/Makefile.osf @@ -1,6 +1,6 @@ # # pppd makefile for OSF/1 on DEC Alpha -# $Id: Makefile.osf,v 1.7 1997/05/22 06:45:44 paulus Exp $ +# $Id: Makefile.osf,v 1.8 1998/03/25 01:27:04 paulus Exp $ # BINDIR = /usr/local/etc @@ -19,7 +19,7 @@ COMPILE_FLAGS = -DSTREAMS -DGIDSET_TYPE=int -D_SOCKADDR_LEN -DCHAPMS -DUSE_CRYPT COPTS = -g LIBS = -CFLAGS = -I.. $(COPTS) $(COMPILE_FLAGS) +CFLAGS = -I../include $(COPTS) $(COMPILE_FLAGS) all: pppd diff --git a/pppd/Makefile.sol2 b/pppd/Makefile.sol2 index 85ea3af..3802760 100644 --- a/pppd/Makefile.sol2 +++ b/pppd/Makefile.sol2 @@ -1,11 +1,11 @@ # # Makefile for pppd under Solaris 2. -# $Id: Makefile.sol2,v 1.9 1998/02/04 01:39:48 paulus Exp $ +# $Id: Makefile.sol2,v 1.10 1998/03/25 01:27:05 paulus Exp $ # include ../svr4/Makedefs -CFLAGS = -DSVR4 -I.. $(COPTS) +CFLAGS = -DSVR4 -I../include $(COPTS) LIBS = -lsocket -lnsl all: pppd diff --git a/pppd/Makefile.sunos4 b/pppd/Makefile.sunos4 index a464fde..66be1b3 100644 --- a/pppd/Makefile.sunos4 +++ b/pppd/Makefile.sunos4 @@ -1,13 +1,13 @@ # # Makefile for pppd under SunOS 4. -# $Id: Makefile.sunos4,v 1.7 1998/02/04 01:39:49 paulus Exp $ +# $Id: Makefile.sunos4,v 1.8 1998/03/25 01:27:06 paulus Exp $ # include ../sunos4/Makedefs LIBS = -CFLAGS = $(COPTS) -I.. -DSUNOS4 +CFLAGS = $(COPTS) -I../include -DSUNOS4 all: pppd diff --git a/pppd/Makefile.svr4 b/pppd/Makefile.svr4 index eb0a134..628f0cd 100644 --- a/pppd/Makefile.svr4 +++ b/pppd/Makefile.svr4 @@ -1,11 +1,11 @@ # # Makefile for pppd under Solaris 2. -# $Id: Makefile.svr4,v 1.12 1998/02/04 01:39:49 paulus Exp $ +# $Id: Makefile.svr4,v 1.13 1998/03/25 01:27:08 paulus Exp $ # include ../svr4/Makedefs -CFLAGS = -DSVR4 -DHAS_SHADOW -I.. $(COPTS) +CFLAGS = -DSVR4 -DHAS_SHADOW -I../include $(COPTS) LIBS = -lsocket -lnsl -lc -L/usr/ucblib -lucb all: pppd diff --git a/pppd/Makefile.ultrix b/pppd/Makefile.ultrix index 53e1e24..9e2b1a6 100644 --- a/pppd/Makefile.ultrix +++ b/pppd/Makefile.ultrix @@ -1,6 +1,6 @@ # # pppd makefile for Ultrix -# $Id: Makefile.ultrix,v 1.9 1996/09/26 06:20:14 paulus Exp $ +# $Id: Makefile.ultrix,v 1.10 1998/03/25 01:27:09 paulus Exp $ # BINDIR = /usr/local/etc @@ -18,7 +18,7 @@ COMPILE_FLAGS = -DNO_DRAND48 -DGIDSET_TYPE=int -DULTRIX COPTS = -O LIBS = -CFLAGS = -I.. $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS) +CFLAGS = -I../include $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS) all: pppd -- 2.39.2