From: Jaroslav Škarvada Date: Wed, 4 Apr 2018 09:29:12 +0000 (+0200) Subject: Honor LDFLAGS X-Git-Tag: ppp-2.4.8~37 X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=a96702158e72c0d527a146940b983a366dbce464;ds=sidebyside Honor LDFLAGS This makes the makefiles include $(LDFLAGS) as a parameter when linking executables. Distros use this as a way of applying linker flags across all the executables they build. [paulus@ozlabs.org - supplied the patch description] Signed-off-by: Jaroslav Škarvada --- diff --git a/chat/Makefile.linux b/chat/Makefile.linux index 1065ac5..0732ec8 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 b541fe8..36d2b03 100644 --- a/pppd/Makefile.linux +++ b/pppd/Makefile.linux @@ -182,7 +182,7 @@ endif ifdef PLUGIN CFLAGS += -DPLUGIN -LDFLAGS += -Wl,-E +LDFLAGS_PLUGIN += -Wl,-E LIBS += -ldl endif @@ -224,7 +224,7 @@ install: pppd $(INSTALL) -c -m 444 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 8a90e39..af53843 100644 --- a/pppd/plugins/Makefile.linux +++ b/pppd/plugins/Makefile.linux @@ -1,7 +1,7 @@ #CC = gcc COPTS = -O2 -g CFLAGS = $(COPTS) -I.. -I../../include -fPIC -LDFLAGS = -shared +LDFLAGS_SHARED = -shared INSTALL = install DESTDIR = $(INSTROOT)@DESTDIR@ @@ -30,7 +30,7 @@ all: $(PLUGINS) for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all || exit $$?; 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 20f62e6..59dde0e 100644 --- a/pppd/plugins/pppoatm/Makefile.linux +++ b/pppd/plugins/pppoatm/Makefile.linux @@ -1,7 +1,7 @@ #CC = gcc COPTS = -O2 -g 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 ea3538e..7981a95 100644 --- a/pppd/plugins/pppol2tp/Makefile.linux +++ b/pppd/plugins/pppol2tp/Makefile.linux @@ -1,7 +1,7 @@ #CC = gcc COPTS = -O2 -g 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 24ed3e5..e702263 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 5d7a271..9803aeb 100644 --- a/pppd/plugins/rp-pppoe/Makefile.linux +++ b/pppd/plugins/rp-pppoe/Makefile.linux @@ -30,7 +30,7 @@ CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"' all: rp-pppoe.so pppoe-discovery pppoe-discovery: pppoe-discovery.o debug.o - $(CC) -o pppoe-discovery pppoe-discovery.o debug.o + $(CC) $(LDFLAGS) -o pppoe-discovery pppoe-discovery.o debug.o pppoe-discovery.o: pppoe-discovery.c $(CC) $(CFLAGS) -c -o pppoe-discovery.o pppoe-discovery.c @@ -39,7 +39,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 ac028f6..cdf7ac4 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 cca6f0f..71afbe6 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