From 0a08540b7faa583f764395a58f3a15390947d57e Mon Sep 17 00:00:00 2001
From: Eric Petit <eric@lapsus.org>
Date: Thu, 28 Sep 2006 16:04:06 +0000
Subject: [PATCH] List libT.a before the -l* flags on the command line
 (otherwise this can cause problems with LDFLAGS=-Wl,--as-needed)

Patch by Daniel T. Lin
---
 mk/beos.mk   | 7 ++++---
 mk/cli.mk    | 2 +-
 mk/common.mk | 2 +-
 mk/gtk.mk    | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mk/beos.mk b/mk/beos.mk
index db7c8328a..81ad16dc3 100644
--- a/mk/beos.mk
+++ b/mk/beos.mk
@@ -8,12 +8,13 @@ SRCS = TRApplication.cpp TRWindow.cpp TRTransfer.cpp \
 OBJS = $(SRCS:%.cpp=%.o)
 
 CXXFLAGS += -I../libtransmission
-LDFLAGS  += ../libtransmission/libtransmission.a
+LDLIBS   += ../libtransmission/libtransmission.a
 CXXFLAGS += -IlibPrefs
-LDFLAGS  += -lbe -ltracker libPrefs/libPrefs.a
+LDFLAGS  += -lbe -ltracker
+LDLIBS   += libPrefs/libPrefs.a
 
 Transmission: $(OBJS) Transmission.rsrc
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
+	$(CXX) -o $@ $(OBJS) $(LDLIBS) $(LDFLAGS)
 	xres -o Transmission Transmission.rsrc
 	mimeset -f Transmission
 
diff --git a/mk/cli.mk b/mk/cli.mk
index da1326edd..51540e685 100644
--- a/mk/cli.mk
+++ b/mk/cli.mk
@@ -7,7 +7,7 @@ SRCS = transmissioncli.c
 OBJS = $(SRCS:%.c=%.o)
 
 CFLAGS  += -I../libtransmission
-LDFLAGS += ../libtransmission/libtransmission.a
+LDLIBS  += ../libtransmission/libtransmission.a
 
 transmissioncli: $(OBJS) ../libtransmission/libtransmission.a
 	$(LINK_RULE)
diff --git a/mk/common.mk b/mk/common.mk
index ef71b9094..761f7ce59 100644
--- a/mk/common.mk
+++ b/mk/common.mk
@@ -52,7 +52,7 @@ endef
 
 define LINK_RULE
 	@echo "Link $@"
-	@CMD="$(CC) -o $@ $(OBJS) $(LDFLAGS)"; $$CMD || \
+	@CMD="$(CC) -o $@ $(OBJS) $(LDLIBS) $(LDFLAGS)"; $$CMD || \
 	  ( echo "Compile line for $@ was:"; echo $$CMD; false )
 endef
 
diff --git a/mk/gtk.mk b/mk/gtk.mk
index fc29eb839..c06055981 100644
--- a/mk/gtk.mk
+++ b/mk/gtk.mk
@@ -8,7 +8,8 @@ SRCS = conf.c dialogs.c io.c ipc.c main.c msgwin.c tr_backend.c tr_torrent.c \
 OBJS = $(SRCS:%.c=%.o)
 
 CFLAGS  += $(CFLAGS_GTK) -I../libtransmission
-LDFLAGS += $(LDFLAGS_GTK) ../libtransmission/libtransmission.a
+LDFLAGS += $(LDFLAGS_GTK)
+LDLIBS  += ../libtransmission/libtransmission.a
 
 all: transmission-gtk .po
 	@true