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 <jskarvad@redhat.com>

diff --git a/chat/Makefile.linux b/chat/Makefile.linux
index 1065ac51957632606a777711f222887a5f6a98d8..0732ec80dc2736431b1ec9178411ff0bd9e3d100 100644 (file)
--- 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 b541fe89a4fa21b264f70a02cb26b4c70efcd21a..36d2b036a8c5d228b0ab3cf754efccc5ffa0c9c5 100644 (file)
--- 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 8a90e393a0578fd4885bfda0fabfd688735eeaf5..af5384381cb07c27fa4043824f80b6ab69807fa9 100644 (file)
--- 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 20f62e631d23c18361ce3164c2fbe2179d0abe90..59dde0e1643266230057fbbb82eaa5e986d03d05 100644 (file)
--- 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 ea3538e22d56a9299614d64094fbdb43a2eab004..7981a9549a4ad5f40d2a686dd909d6f976ace5b8 100644 (file)
--- 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 24ed3e580c4db6aeca129dd22dbe6de5f2d1ff5f..e7022636906d8219d75165fda6ffccda695c9fe0 100644 (file)
--- 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 5d7a2719545d2e52f4f9b62ea51dff2697b736d6..9803aeb4ebbae07bb7d8a527f942b753eb5b404e 100644 (file)
--- 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 ac028f6bf4f0d121f38ff1519ee2632c1a663df8..cdf7ac4341fb4859d105970bf53ff208cd06f7cd 100644 (file)
--- 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 cca6f0f61d87f70016e903dbad7821dc87473249..71afbe67eff4916bfd70bb4ba9bf01b8d1c3d374 100644 (file)
--- 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