]> git.sur5r.net Git - i3/i3/commitdiff
Fix linking by linking libi3 first and its dependencies afterwards
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 23 Jul 2012 08:56:44 +0000 (10:56 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 23 Jul 2012 08:56:44 +0000 (10:56 +0200)
Interestingly, compilation was only broken on some systems apparently

i3-dump-log/i3-dump-log.mk
i3-msg/i3-msg.mk

index 1508a8dc25260965f3dd5c25120bb740a9725cd4..17e53a6d234aafdf409e601eda8ccc2b7f2485fe 100644 (file)
@@ -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"
 
 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"
 
 install-i3-dump-log: i3-dump-log/i3-dump-log
        echo "[i3-dump-log] Install"
index bab26da63fff9f32c16f76fee767bbb6acf04a6d..01d5fc7e9790c881423151b7f437cd5f06f169e5 100644 (file)
@@ -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"
 
 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"
 
 install-i3-msg: i3-msg/i3-msg
        echo "[i3-msg] Install"