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
This commit is contained in:
Eric Petit 2006-09-28 16:04:06 +00:00
parent 8079b10845
commit 0a08540b7f
4 changed files with 8 additions and 6 deletions

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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