Makefile: Always link libi3 first

diff --git a/i3-config-wizard/i3-config-wizard.mk b/i3-config-wizard/i3-config-wizard.mk
index bce679dfc932c06f0b918bc6a1e8e058dff838f0..526a4ecdade8cd7b47ad343f6057765c771ec2f9 100644 (file)
--- a/i3-config-wizard/i3-config-wizard.mk
+++ b/i3-config-wizard/i3-config-wizard.mk
@@ -25,7 +25,7 @@ i3-config-wizard/cfgparse.tab.c: i3-config-wizard/cfgparse.y $(i3_config_wizard_
 
 i3-config-wizard/i3-config-wizard: libi3.a $(i3_config_wizard_OBJECTS)
        echo "[i3-config-wizard] Link i3-config-wizard"
-       $(CC) $(I3_LDFLAGS) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(i3_config_wizard_LIBS) $(LIBS)
+       $(CC) $(I3_LDFLAGS) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(LIBS) $(i3_config_wizard_LIBS)
 
 install-i3-config-wizard: i3-config-wizard/i3-config-wizard
        echo "[i3-config-wizard] Install"

diff --git a/i3-input/i3-input.mk b/i3-input/i3-input.mk
index 9fb4b194704d2ed928c7063325f9410f03849fd4..98131e76e099a2a9f42ed8f5f93b603a1679866a 100644 (file)
--- a/i3-input/i3-input.mk
+++ b/i3-input/i3-input.mk
@@ -16,7 +16,7 @@ i3-input/%.o: i3-input/%.c $(i3_input_HEADERS)
 
 i3-input/i3-input: libi3.a $(i3_input_OBJECTS)
        echo "[i3-input] Link i3-input"
-       $(CC) $(I3_LDFLAGS) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(i3_input_LIBS) $(LIBS)
+       $(CC) $(I3_LDFLAGS) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(LIBS) $(i3_input_LIBS)
 
 install-i3-input: i3-input/i3-input
        echo "[i3-input] Install"

diff --git a/i3-nagbar/i3-nagbar.mk b/i3-nagbar/i3-nagbar.mk
index f54d8380554d3c5c4475f12899917ca6bad74c37..5e5f2c4d165fc2459be1cab285966937fa4cf726 100644 (file)
--- a/i3-nagbar/i3-nagbar.mk
+++ b/i3-nagbar/i3-nagbar.mk
@@ -16,7 +16,7 @@ i3-nagbar/%.o: i3-nagbar/%.c $(i3_nagbar_HEADERS)
 
 i3-nagbar/i3-nagbar: libi3.a $(i3_nagbar_OBJECTS)
        echo "[i3-nagbar] Link i3-nagbar"
-       $(CC) $(I3_LDFLAGS) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(i3_nagbar_LIBS) $(LIBS)
+       $(CC) $(I3_LDFLAGS) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(LIBS) $(i3_nagbar_LIBS)
 
 install-i3-nagbar: i3-nagbar/i3-nagbar
        echo "[i3-nagbar] Install"

diff --git a/i3bar/i3bar.mk b/i3bar/i3bar.mk
index cf3bf346a0a41facd167da9413c2c34fc91688f0..5b4ddd807a0375e27e20121a7fbd2975e231166d 100644 (file)
--- a/i3bar/i3bar.mk
+++ b/i3bar/i3bar.mk
@@ -16,7 +16,7 @@ i3bar/src/%.o: i3bar/src/%.c $(i3bar_HEADERS)
 
 i3bar/i3bar: libi3.a $(i3bar_OBJECTS)
        echo "[i3bar] Link i3bar"
-       $(CC) $(I3_LDFLAGS) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(i3bar_LIBS) $(LIBS)
+       $(CC) $(I3_LDFLAGS) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(LIBS) $(i3bar_LIBS)
 
 install-i3bar: i3bar/i3bar
        echo "[i3bar] Install"

diff --git a/src/i3.mk b/src/i3.mk
index 8ba04cd295c2ad60eea336f141f57196377f2d91..9591e178ebc238710942eb2fd7263ec2483b2456 100644 (file)
--- a/src/i3.mk
+++ b/src/i3.mk
@@ -50,7 +50,7 @@ src/cfgparse.tab.c: src/cfgparse.y $(i3_HEADERS_DEP)
 # and once as an object file for i3.
 src/commands_parser.o: src/commands_parser.c $(i3_HEADERS_DEP) i3-command-parser.stamp
        echo "[i3] CC $<"
-       $(CC) $(I3_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) $(I3_CFLAGS) $(CFLAGS) $(I3_LDFLAGS) $(LDFLAGS) -DTEST_PARSER -o test.commands_parser $< $(i3_LIBS) $(LIBS)
+       $(CC) $(I3_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) $(I3_CFLAGS) $(CFLAGS) $(I3_LDFLAGS) $(LDFLAGS) -DTEST_PARSER -o test.commands_parser $< $(LIBS) $(i3_LIBS)
        $(CC) $(I3_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) $(I3_CFLAGS) $(CFLAGS) -c -o $@ ${canonical_path}/$<
 
 i3-command-parser.stamp: generate-command-parser.pl parser-specs/commands.spec
@@ -60,7 +60,7 @@ i3-command-parser.stamp: generate-command-parser.pl parser-specs/commands.spec
 
 i3: libi3.a $(i3_OBJECTS)
        echo "[i3] Link i3"
-       $(CC) $(I3_LDFLAGS) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(i3_LIBS) $(LIBS)
+       $(CC) $(I3_LDFLAGS) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(LIBS) $(i3_LIBS)
 
 install-i3: i3
        echo "[i3] Install"