149 lines
5.0 KiB
Diff
149 lines
5.0 KiB
Diff
diff -ruN ppp-2.4.3-orig/chat/Makefile.linux ppp-2.4.3/chat/Makefile.linux
|
|
--- ppp-2.4.3-orig/chat/Makefile.linux 2010-06-17 17:14:37.000097000 +0530
|
|
+++ ppp-2.4.3/chat/Makefile.linux 2010-06-17 17:27:35.000909000 +0530
|
|
@@ -18,7 +18,7 @@
|
|
all: chat
|
|
|
|
chat: chat.o
|
|
- $(CC) -o chat chat.o
|
|
+ $(CC) $(LDFLAGS) -o chat chat.o
|
|
|
|
chat.o: chat.c
|
|
$(CC) -c $(CFLAGS) -o chat.o chat.c
|
|
diff -ruN ppp-2.4.3-orig/pppd/Makefile.linux ppp-2.4.3/pppd/Makefile.linux
|
|
--- ppp-2.4.3-orig/pppd/Makefile.linux 2010-06-17 17:14:37.003037000 +0530
|
|
+++ ppp-2.4.3/pppd/Makefile.linux 2010-06-17 17:35:45.000023000 +0530
|
|
@@ -84,6 +84,8 @@
|
|
|
|
CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS)
|
|
|
|
+LDFLAGS=$(LDOPTS)
|
|
+
|
|
ifdef CHAPMS
|
|
CFLAGS += -DCHAPMS=1
|
|
NEEDDES=y
|
|
diff -ruN ppp-2.4.3-orig/pppd/plugins/Makefile.linux ppp-2.4.3/pppd/plugins/Makefile.linux
|
|
--- ppp-2.4.3-orig/pppd/plugins/Makefile.linux 2010-06-17 17:14:37.001899000 +0530
|
|
+++ ppp-2.4.3/pppd/plugins/Makefile.linux 2010-06-17 17:27:35.000930000 +0530
|
|
@@ -1,7 +1,7 @@
|
|
CC = gcc
|
|
COPTS = -O2 -g
|
|
CFLAGS = $(COPTS) -I.. -I../../include -fPIC
|
|
-LDFLAGS = -shared
|
|
+LDFLAGS = $(LDOPTS) -shared
|
|
INSTALL = install
|
|
|
|
DESTDIR = @DESTDIR@
|
|
diff -ruN ppp-2.4.3-orig/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.3/pppd/plugins/pppoatm/Makefile.linux
|
|
--- ppp-2.4.3-orig/pppd/plugins/pppoatm/Makefile.linux 2010-06-17 17:14:37.001996000 +0530
|
|
+++ ppp-2.4.3/pppd/plugins/pppoatm/Makefile.linux 2010-06-17 17:27:35.000951000 +0530
|
|
@@ -1,7 +1,7 @@
|
|
CC = gcc
|
|
COPTS = -O2 -g
|
|
CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC
|
|
-LDFLAGS = -shared
|
|
+LDFLAGS = $(LDOPTS) -shared
|
|
INSTALL = install
|
|
|
|
#***********************************************************************
|
|
@@ -33,7 +33,7 @@
|
|
all: $(PLUGIN)
|
|
|
|
$(PLUGIN): $(PLUGIN_OBJS)
|
|
- $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS)
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -shared $^ $(LIBS)
|
|
|
|
install: all
|
|
$(INSTALL) -d -m 755 $(LIBDIR)
|
|
diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux ppp-2.4.3/pppd/plugins/radius/Makefile.linux
|
|
--- ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux 2010-06-17 17:14:37.001288000 +0530
|
|
+++ ppp-2.4.3/pppd/plugins/radius/Makefile.linux 2010-06-17 17:34:07.000023000 +0530
|
|
@@ -14,6 +14,7 @@
|
|
PLUGIN=radius.so radattr.so radrealms.so
|
|
COPTS = -O2
|
|
CFLAGS=-I. -I../.. -I../../../include $(COPTS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
|
|
+LDFLAGS=$(LDOPTS)
|
|
|
|
# Uncomment the next line to include support for Microsoft's
|
|
# MS-CHAP authentication protocol.
|
|
@@ -44,13 +45,13 @@
|
|
$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
|
|
|
|
radius.so: radius.o libradiusclient.a
|
|
- $(CC) -o radius.so -shared radius.o libradiusclient.a
|
|
+ $(CC) $(LDFLAGS) -o radius.so -shared radius.o libradiusclient.a
|
|
|
|
radattr.so: radattr.o
|
|
- $(CC) -o radattr.so -shared radattr.o
|
|
+ $(CC) $(LDFLAGS) -o radattr.so -shared radattr.o
|
|
|
|
radrealms.so: radrealms.o
|
|
- $(CC) -o radrealms.so -shared radrealms.o
|
|
+ $(CC) $(LDFLAGS) -o radrealms.so -shared radrealms.o
|
|
|
|
CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \
|
|
clientid.o sendserver.o lock.o util.o md5.o
|
|
diff -ruN ppp-2.4.3-orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux
|
|
--- ppp-2.4.3-orig/pppd/plugins/rp-pppoe/Makefile.linux 2010-06-17 17:14:37.001616000 +0530
|
|
+++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux 2010-06-17 17:32:51.000023000 +0530
|
|
@@ -26,16 +26,17 @@
|
|
|
|
COPTS=-O2 -g
|
|
CFLAGS=$(COPTS) -I../../../include/linux
|
|
+LDFLAGS=$(LDOPTS)
|
|
all: rp-pppoe.so pppoe-discovery
|
|
|
|
pppoe-discovery: pppoe-discovery.o utils.o libplugin.a
|
|
- $(CC) -o pppoe-discovery pppoe-discovery.o utils.o libplugin.a
|
|
+ $(CC) $(LDFLAGS) -o pppoe-discovery pppoe-discovery.o utils.o libplugin.a
|
|
|
|
pppoe-discovery.o: pppoe-discovery.c
|
|
$(CC) $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o pppoe-discovery.o pppoe-discovery.c
|
|
|
|
rp-pppoe.so: libplugin.a plugin.o
|
|
- $(CC) -o rp-pppoe.so -shared plugin.o libplugin.a
|
|
+ $(CC) $(LDFLAGS) -o rp-pppoe.so -shared plugin.o libplugin.a
|
|
|
|
install: all
|
|
$(INSTALL) -d -m 755 $(LIBDIR)
|
|
diff -ruN ppp-2.4.3-orig/pppdump/Makefile.linux ppp-2.4.3/pppdump/Makefile.linux
|
|
--- ppp-2.4.3-orig/pppdump/Makefile.linux 2010-06-17 17:14:38.000585000 +0530
|
|
+++ ppp-2.4.3/pppdump/Makefile.linux 2010-06-17 17:37:05.000023000 +0530
|
|
@@ -4,6 +4,7 @@
|
|
|
|
COPTS = -O
|
|
CFLAGS= $(COPTS) -I../include/net
|
|
+LDFLAGS= $(LDOPTS)
|
|
OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
|
|
|
|
INSTALL= install
|
|
@@ -11,7 +12,7 @@
|
|
all: pppdump
|
|
|
|
pppdump: $(OBJS)
|
|
- $(CC) -o pppdump $(OBJS)
|
|
+ $(CC) $(LDFLAGS) -o pppdump $(OBJS)
|
|
|
|
clean:
|
|
rm -f pppdump $(OBJS) *~
|
|
diff -ruN ppp-2.4.3-orig/pppstats/Makefile.linux ppp-2.4.3/pppstats/Makefile.linux
|
|
--- ppp-2.4.3-orig/pppstats/Makefile.linux 2010-06-17 17:14:38.000756000 +0530
|
|
+++ ppp-2.4.3/pppstats/Makefile.linux 2010-06-17 17:36:30.000023000 +0530
|
|
@@ -17,6 +17,7 @@
|
|
INSTALL= install
|
|
|
|
CFLAGS = $(COPTS) $(COMPILE_FLAGS)
|
|
+LDFLAGS = $(LDOPTS)
|
|
|
|
all: pppstats
|
|
|
|
@@ -26,7 +27,7 @@
|
|
$(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
|
|
|
|
pppstats: $(PPPSTATSRCS)
|
|
- $(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS)
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) -o pppstats pppstats.c $(LIBS)
|
|
|
|
clean:
|
|
rm -f pppstats *~ #* core
|