From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 23 Jul 2012 08:56:44 +0000 (+0200)
Subject: Fix linking by linking libi3 first and its dependencies afterwards
X-Git-Tag: 4.3~158
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0f22b105c1e76756a41d0275ddb552e9ad8c7f6e;p=i3%2Fi3

Fix linking by linking libi3 first and its dependencies afterwards

Interestingly, compilation was only broken on some systems apparently
---

diff --git a/i3-dump-log/i3-dump-log.mk b/i3-dump-log/i3-dump-log.mk
index 1508a8dc..17e53a6d 100644
--- a/i3-dump-log/i3-dump-log.mk
+++ b/i3-dump-log/i3-dump-log.mk
@@ -16,7 +16,7 @@ i3-dump-log/%.o: i3-dump-log/%.c $(i3_dump_log_HEADERS)
 
 i3-dump-log/i3-dump-log: libi3.a $(i3_dump_log_OBJECTS)
 	echo "[i3-dump-log] Link i3-dump-log"
-	$(CC) $(I3_LDFLAGS) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(i3_dump_log_LIBS) $(LIBS)
+	$(CC) $(I3_LDFLAGS) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(LIBS) $(i3_dump_log_LIBS)
 
 install-i3-dump-log: i3-dump-log/i3-dump-log
 	echo "[i3-dump-log] Install"
diff --git a/i3-msg/i3-msg.mk b/i3-msg/i3-msg.mk
index bab26da6..01d5fc7e 100644
--- a/i3-msg/i3-msg.mk
+++ b/i3-msg/i3-msg.mk
@@ -16,7 +16,7 @@ i3-msg/%.o: i3-msg/%.c $(i3_msg_HEADERS)
 
 i3-msg/i3-msg: libi3.a $(i3_msg_OBJECTS)
 	echo "[i3-msg] Link i3-msg"
-	$(CC) $(I3_LDFLAGS) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(i3_msg_LIBS) $(LIBS)
+	$(CC) $(I3_LDFLAGS) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(LIBS) $(i3_msg_LIBS)
 
 install-i3-msg: i3-msg/i3-msg
 	echo "[i3-msg] Install"