1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
|
--- ppp-2.4.6.orig/pppd/Makefile.linux 2014-01-02 05:42:08.000000000 +0100
+++ ppp-2.4.6/pppd/Makefile.linux 2014-06-06 08:23:21.000000000 +0200
@@ -2,12 +2,7 @@
# pppd makefile for Linux
# $Id: Makefile.linux,v 1.70 2007/06/19 02:08:34 carlsonj Exp $
#
-
-# Default installation locations
-DESTDIR = $(INSTROOT)@DESTDIR@
-BINDIR = $(DESTDIR)/sbin
-MANDIR = $(DESTDIR)/share/man/man8
-INCDIR = $(DESTDIR)/include
+include ../Makedefs.com
TARGETS = pppd
@@ -24,16 +19,6 @@ PPPDOBJS = main.o magic.o fsm.o lcp.o ip
ecp.o auth.o options.o demand.o utils.o sys-linux.o ipxcp.o tty.o \
eap.o chap-md5.o session.o
-#
-# include dependencies if present
-ifeq (.depend,$(wildcard .depend))
-include .depend
-endif
-
-# CC = gcc
-#
-COPTS = -O2 -pipe -Wall -g
-LIBS =
# Uncomment the next 2 lines to include support for Microsoft's
# MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux.
@@ -78,28 +63,25 @@ USE_LIBUTIL=y
MAXOCTETS=y
-INCLUDE_DIRS= -I../include
-
-COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP
-
-CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"'
+CPPFLAGS += -I../include
+CPPFLAGS += -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP '-DDESTDIR="@DESTDIR@"'
ifdef CHAPMS
-CFLAGS += -DCHAPMS=1
+CPPFLAGS += -DCHAPMS=1
NEEDDES=y
PPPDOBJS += md4.o chap_ms.o
HEADERS += md4.h chap_ms.h
ifdef MSLANMAN
-CFLAGS += -DMSLANMAN=1
+CPPFLAGS += -DMSLANMAN=1
endif
ifdef MPPE
-CFLAGS += -DMPPE=1
+CPPFLAGS += -DMPPE=1
endif
endif
# EAP SRP-SHA1
ifdef USE_SRP
-CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
+CPPFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
LIBS += -lsrp -L/usr/local/ssl/lib -lcrypto
TARGETS += srp-entry
EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
@@ -116,17 +98,17 @@ PPPDOBJS += sha1.o
endif
ifdef HAS_SHADOW
-CFLAGS += -DHAS_SHADOW
+CPPFLAGS += -DHAS_SHADOW
#LIBS += -lshadow $(LIBS)
endif
ifneq ($(wildcard /usr/include/crypt.h),)
-CFLAGS += -DHAVE_CRYPT_H=1
+CPPFLAGS += -DHAVE_CRYPT_H=1
LIBS += -lcrypt
endif
ifdef USE_LIBUTIL
-CFLAGS += -DHAVE_LOGWTMP=1
+CPPFLAGS += -DHAVE_LOGWTMP=1
LIBS += -lutil
endif
@@ -134,7 +116,7 @@ ifdef NEEDDES
ifndef USE_CRYPT
LIBS += -ldes $(LIBS)
else
-CFLAGS += -DUSE_CRYPT=1
+CPPFLAGS += -DUSE_CRYPT=1
endif
PPPDOBJS += pppcrypt.o
HEADERS += pppcrypt.h
@@ -142,36 +124,36 @@ endif
# For "Pluggable Authentication Modules", see ftp.redhat.com:/pub/pam/.
ifdef USE_PAM
-CFLAGS += -DUSE_PAM
+CPPFLAGS += -DUSE_PAM
LIBS += -lpam -ldl
endif
# Multi-linnk
ifdef HAVE_MULTILINK
- # Multilink implies the use of TDB
- USE_TDB=y
+# Multilink implies the use of TDB
+USE_TDB=y
- CFLAGS += -DHAVE_MULTILINK
- PPPDSRCS += multilink.c
- PPPDOBJS += multilink.o
+CPPFLAGS += -DHAVE_MULTILINK
+PPPDSRCS += multilink.c
+PPPDOBJS += multilink.o
endif
# TDB
ifdef USE_TDB
- CFLAGS += -DUSE_TDB=1
- PPPDSRCS += tdb.c spinlock.c
- PPPDOBJS += tdb.o spinlock.o
- HEADERS += tdb.h spinlock.h
+CPPFLAGS += -DUSE_TDB=1
+PPPDSRCS += tdb.c spinlock.c
+PPPDOBJS += tdb.o spinlock.o
+HEADERS += tdb.h spinlock.h
endif
# Lock library binary for Linux is included in 'linux' subdirectory.
ifdef LOCKLIB
LIBS += -llock
-CFLAGS += -DLOCKLIB=1
+CPPFLAGS += -DLOCKLIB=1
endif
ifdef PLUGIN
-CFLAGS += -DPLUGIN
+CPPFLAGS += -DPLUGIN
LDFLAGS += -Wl,-E
LIBS += -ldl
endif
@@ -179,36 +161,34 @@ endif
ifdef FILTER
ifneq ($(wildcard /usr/include/pcap-bpf.h),)
LIBS += -lpcap
-CFLAGS += -DPPP_FILTER
+CPPFLAGS += -DPPP_FILTER
endif
endif
ifdef HAVE_INET6
- PPPDSRCS += ipv6cp.c eui64.c
- HEADERS += ipv6cp.h eui64.h
- PPPDOBJS += ipv6cp.o eui64.o
- CFLAGS += -DINET6=1
+PPPDSRCS += ipv6cp.c eui64.c
+HEADERS += ipv6cp.h eui64.h
+PPPDOBJS += ipv6cp.o eui64.o
+CPPFLAGS += -DINET6=1
endif
ifdef CBCP
- PPPDSRCS += cbcp.c
- PPPDOBJS += cbcp.o
- CFLAGS += -DCBCP_SUPPORT
- HEADERS += cbcp.h
+PPPDSRCS += cbcp.c
+PPPDOBJS += cbcp.o
+CPPFLAGS += -DCBCP_SUPPORT
+HEADERS += cbcp.h
endif
ifdef MAXOCTETS
- CFLAGS += -DMAXOCTETS
+CPPFLAGS += -DMAXOCTETS
endif
-INSTALL= install
-
all: $(TARGETS)
install: pppd
mkdir -p $(BINDIR) $(MANDIR)
$(EXTRAINSTALL)
- $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
+ $(INSTALL) $(STRIP) -c -m 555 pppd $(BINDIR)/pppd
if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
chmod o-rx,u+s $(BINDIR)/pppd; fi
$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
@@ -216,8 +196,8 @@ install: pppd
pppd: $(PPPDOBJS)
$(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
-srp-entry: srp-entry.c
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ srp-entry.c $(LIBS)
+srp-entry: srp-entry.o
+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
install-devel:
mkdir -p $(INCDIR)/pppd
@@ -225,6 +205,3 @@ install-devel:
clean:
rm -f $(PPPDOBJS) $(EXTRACLEAN) $(TARGETS) *~ #* core
-
-depend:
- $(CPP) -M $(CFLAGS) $(PPPDSRCS) >.depend
|
