From 62a06de3a515f64afd829cdcabcf3bfaf7f6894d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20E=2E=20=27Flameeyes=27=20Petten=C3=83=C2=B2?= Date: Sat, 24 Jan 2009 13:39:26 -0800 Subject: [PATCH] crda: Fix --as-needed usage MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit For --as-needed to work (and for traditional ld too) the libraries should always be passed _after_ the object files, move them so that they are picked up properly. Also rename LIBS to NLLIBS to avoid confusion between LIBS/LDLIBS. Signed-off-by: Diego E. 'Flameeyes' Pettenò Signed-off-by: Luis R. Rodriguez --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a07fbcf..aaa9ca6 100644 --- a/Makefile +++ b/Makefile @@ -48,11 +48,11 @@ endif ifeq ($(NL2FOUND),Y) CFLAGS += -DCONFIG_LIBNL20 -LIBS += -lnl-genl +NLLIBS += -lnl-genl NLLIBNAME = libnl-2.0 endif -LIBS += `pkg-config --libs $(NLLIBNAME)` +NLLIBS += `pkg-config --libs $(NLLIBNAME)` CFLAGS += `pkg-config --cflags $(NLLIBNAME)` ifeq ($(V),1) @@ -85,7 +85,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) crda: reglib.o crda.o $(NQ) ' LD ' $@ - $(Q)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^ $(LDLIBS) + $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(NLLIBS) regdbdump: reglib.o regdbdump.o print-regdom.o $(NQ) ' LD ' $@ -- 2.7.4