From b01545b131017224952b409df32c7ae40fdb6f69 Mon Sep 17 00:00:00 2001 From: Quentin Glidic Date: Sun, 12 Aug 2012 00:59:19 +0200 Subject: [PATCH] Makefile: Always link libi3 first --- i3-config-wizard/i3-config-wizard.mk | 2 +- i3-input/i3-input.mk | 2 +- i3-nagbar/i3-nagbar.mk | 2 +- i3bar/i3bar.mk | 2 +- src/i3.mk | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/i3-config-wizard/i3-config-wizard.mk b/i3-config-wizard/i3-config-wizard.mk index bce679df..526a4ecd 100644 --- 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 9fb4b194..98131e76 100644 --- 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 f54d8380..5e5f2c4d 100644 --- 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 cf3bf346..5b4ddd80 100644 --- 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 8ba04cd2..9591e178 100644 --- 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"