You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
171 lines
5.2 KiB
171 lines
5.2 KiB
5 years ago
|
diff --git a/chat/Makefile.linux b/chat/Makefile.linux
|
||
|
|
index 2445637..83114f1 100644
|
||
|
|
--- a/chat/Makefile.linux
|
||
|
|
+++ b/chat/Makefile.linux
|
||
|
|
@@ -18,7 +18,7 @@ INSTALL= install
|
||
|
|
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 --git a/pppd/Makefile.linux b/pppd/Makefile.linux
|
||
|
|
index cf11b74..089f164 100644
|
||
|
|
--- a/pppd/Makefile.linux
|
||
|
|
+++ b/pppd/Makefile.linux
|
||
|
|
@@ -188,7 +188,7 @@ endif
|
||
|
|
|
||
|
|
ifdef PLUGIN
|
||
|
|
CFLAGS += -DPLUGIN
|
||
|
|
-LDFLAGS += -Wl,-E
|
||
|
|
+LDFLAGS_PLUGIN += -Wl,-E
|
||
|
|
LIBS += -ldl
|
||
|
|
endif
|
||
|
|
|
||
|
|
@@ -230,7 +230,7 @@ install: pppd
|
||
|
|
$(INSTALL) -c -m 644 pppd.8 $(MANDIR)
|
||
|
|
|
||
|
|
pppd: $(PPPDOBJS)
|
||
|
|
- $(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
|
||
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_PLUGIN) -o pppd $(PPPDOBJS) $(LIBS)
|
||
|
|
|
||
|
|
srp-entry: srp-entry.c
|
||
|
|
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ srp-entry.c $(LIBS)
|
||
|
|
diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
|
||
|
|
index 303833a..04fe876 100644
|
||
|
|
--- a/pppd/plugins/Makefile.linux
|
||
|
|
+++ b/pppd/plugins/Makefile.linux
|
||
|
|
@@ -1,7 +1,7 @@
|
||
|
|
#CC = gcc
|
||
|
|
COPTS = $(RPM_OPT_FLAGS)
|
||
|
|
CFLAGS = $(COPTS) -I.. -I../../include -fPIC
|
||
|
|
-LDFLAGS = -shared
|
||
|
|
+LDFLAGS_SHARED = -shared
|
||
|
|
INSTALL = install
|
||
|
|
|
||
|
|
# EAP-TLS
|
||
|
|
@@ -33,7 +33,7 @@ all: $(PLUGINS)
|
||
|
|
for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done
|
||
|
|
|
||
|
|
%.so: %.c
|
||
|
|
- $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^
|
||
|
|
+ $(CC) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) $(CFLAGS) $^
|
||
|
|
|
||
|
|
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h)
|
||
|
|
|
||
|
|
diff --git a/pppd/plugins/pppoatm/Makefile.linux b/pppd/plugins/pppoatm/Makefile.linux
|
||
|
|
index 4c5826f..1961e0e 100644
|
||
|
|
--- a/pppd/plugins/pppoatm/Makefile.linux
|
||
|
|
+++ b/pppd/plugins/pppoatm/Makefile.linux
|
||
|
|
@@ -1,7 +1,7 @@
|
||
|
|
#CC = gcc
|
||
|
|
COPTS = $(RPM_OPT_FLAGS)
|
||
|
|
CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC
|
||
|
|
-LDFLAGS = -shared
|
||
|
|
+LDFLAGS_SHARED = -shared
|
||
|
|
INSTALL = install
|
||
|
|
|
||
|
|
#***********************************************************************
|
||
|
|
@@ -33,7 +33,7 @@ endif
|
||
|
|
all: $(PLUGIN)
|
||
|
|
|
||
|
|
$(PLUGIN): $(PLUGIN_OBJS)
|
||
|
|
- $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS)
|
||
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LDFLAGS_SHARED) $^ $(LIBS)
|
||
|
|
|
||
|
|
install: all
|
||
|
|
$(INSTALL) -d -m 755 $(LIBDIR)
|
||
|
|
diff --git a/pppd/plugins/pppol2tp/Makefile.linux b/pppd/plugins/pppol2tp/Makefile.linux
|
||
|
|
index 9cb316d..7b23b25 100644
|
||
|
|
--- a/pppd/plugins/pppol2tp/Makefile.linux
|
||
|
|
+++ b/pppd/plugins/pppol2tp/Makefile.linux
|
||
|
|
@@ -1,7 +1,7 @@
|
||
|
|
#CC = gcc
|
||
|
|
COPTS = $(RPM_OPT_FLAGS) -DHAVE_MULTILINK
|
||
|
|
CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC
|
||
|
|
-LDFLAGS = -shared
|
||
|
|
+LDFLAGS_SHARED = -shared
|
||
|
|
INSTALL = install
|
||
|
|
|
||
|
|
#***********************************************************************
|
||
|
|
@@ -16,7 +16,7 @@ PLUGINS := pppol2tp.so openl2tp.so
|
||
|
|
all: $(PLUGINS)
|
||
|
|
|
||
|
|
%.so: %.o
|
||
|
|
- $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS)
|
||
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LDFLAGS_SHARED) $^ $(LIBS)
|
||
|
|
|
||
|
|
install: all
|
||
|
|
$(INSTALL) -d -m 755 $(LIBDIR)
|
||
|
|
diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux
|
||
|
|
index 707326b..2150332 100644
|
||
|
|
--- a/pppd/plugins/radius/Makefile.linux
|
||
|
|
+++ b/pppd/plugins/radius/Makefile.linux
|
||
|
|
@@ -43,13 +43,13 @@ install: all
|
||
|
|
$(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 --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
|
||
|
|
index fa49efb..5e06b52 100644
|
||
|
|
--- a/pppd/plugins/rp-pppoe/Makefile.linux
|
||
|
|
+++ b/pppd/plugins/rp-pppoe/Makefile.linux
|
||
|
|
@@ -31,7 +31,7 @@ CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
|
||
|
|
all: rp-pppoe.so pppoe-discovery
|
||
|
|
|
||
|
|
pppoe-discovery: pppoe-discovery.o debug.o common.o
|
||
|
|
- $(CC) -o pppoe-discovery pppoe-discovery.o debug.o -ludev
|
||
|
|
+ $(CC) $(LDFLAGS) -o pppoe-discovery pppoe-discovery.o debug.o -ludev
|
||
|
|
|
||
|
|
pppoe-discovery.o: pppoe-discovery.c
|
||
|
|
$(CC) $(CFLAGS) -c -o pppoe-discovery.o pppoe-discovery.c
|
||
|
|
@@ -40,7 +40,7 @@ debug.o: debug.c
|
||
|
|
$(CC) $(CFLAGS) -c -o debug.o debug.c
|
||
|
|
|
||
|
|
rp-pppoe.so: plugin.o discovery.o if.o common.o
|
||
|
|
- $(CC) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o
|
||
|
|
+ $(CC) $(LDFLAGS) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o
|
||
|
|
|
||
|
|
install: all
|
||
|
|
$(INSTALL) -d -m 755 $(LIBDIR)
|
||
|
|
diff --git a/pppdump/Makefile.linux b/pppdump/Makefile.linux
|
||
|
|
index 95c6805..33e5107 100644
|
||
|
|
--- a/pppdump/Makefile.linux
|
||
|
|
+++ b/pppdump/Makefile.linux
|
||
|
|
@@ -10,7 +10,7 @@ INSTALL= install
|
||
|
|
all: pppdump
|
||
|
|
|
||
|
|
pppdump: $(OBJS)
|
||
|
|
- $(CC) -o pppdump $(OBJS)
|
||
|
|
+ $(CC) $(LDFLAGS) -o pppdump $(OBJS)
|
||
|
|
|
||
|
|
clean:
|
||
|
|
rm -f pppdump $(OBJS) *~
|
||
|
|
diff --git a/pppstats/Makefile.linux b/pppstats/Makefile.linux
|
||
|
|
index c5ba3b1..eeccf83 100644
|
||
|
|
--- a/pppstats/Makefile.linux
|
||
|
|
+++ b/pppstats/Makefile.linux
|
||
|
|
@@ -26,7 +26,7 @@ install: pppstats
|
||
|
|
$(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
|