Makefile: respect and use LIBS (Thanks Kacper)

diff --git a/Makefile b/Makefile
index d628eaf7869782df2bc7e40d79e56a83fc13f6cf..fccb0690543e68b4615fd3e08d8562c67e009495 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ src/%.o: src/%.c ${HEADERS}
 
 all: src/cfgparse.y.o src/cfgparse.yy.o src/cmdparse.y.o src/cmdparse.yy.o ${FILES}
        echo "LINK i3"
-       $(CC) -o i3 $^ $(LDFLAGS)
+       $(CC) $(LDFLAGS) -o i3 $^ $(LIBS)
 
 loglevels.h:
        echo "LOGLEVELS"

diff --git a/common.mk b/common.mk
index c7131f22b0c621b44d38871b1d876aafce92bc8d..76813264275bea07768181949b320d647bf401bd 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -49,23 +49,23 @@ CPPFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
 CPPFLAGS += -DSYSCONFDIR=\"${SYSCONFDIR}\"
 CPPFLAGS += -DTERM_EMU=\"$(TERM_EMU)\"
 
-LDFLAGS += -lm
-LDFLAGS += $(call ldflags_for_lib, xcb-event, xcb-event)
-LDFLAGS += $(call ldflags_for_lib, xcb-keysyms, xcb-keysyms)
+LIBS += -lm
+LIBS += $(call ldflags_for_lib, xcb-event, xcb-event)
+LIBS += $(call ldflags_for_lib, xcb-keysyms, xcb-keysyms)
 ifeq ($(shell pkg-config --exists xcb-util || echo 1),1)
-LDFLAGS += $(call ldflags_for_lib, xcb-atom, xcb-atom)
-LDFLAGS += $(call ldflags_for_lib, xcb-aux, xcb-aux)
+LIBS += $(call ldflags_for_lib, xcb-atom, xcb-atom)
+LIBS += $(call ldflags_for_lib, xcb-aux, xcb-aux)
 else
-LDFLAGS += $(call ldflags_for_lib, xcb-util)
+LIBS += $(call ldflags_for_lib, xcb-util)
 endif
-LDFLAGS += $(call ldflags_for_lib, xcb-icccm, xcb-icccm)
-LDFLAGS += $(call ldflags_for_lib, xcb-xinerama, xcb-xinerama)
-LDFLAGS += $(call ldflags_for_lib, xcb-randr, xcb-randr)
-LDFLAGS += $(call ldflags_for_lib, xcb, xcb)
-LDFLAGS += $(call ldflags_for_lib, xcursor, Xcursor)
-LDFLAGS += $(call ldflags_for_lib, x11, X11)
-LDFLAGS += $(call ldflags_for_lib, yajl, yajl)
-LDFLAGS += $(call ldflags_for_lib, libev, ev)
+LIBS += $(call ldflags_for_lib, xcb-icccm, xcb-icccm)
+LIBS += $(call ldflags_for_lib, xcb-xinerama, xcb-xinerama)
+LIBS += $(call ldflags_for_lib, xcb-randr, xcb-randr)
+LIBS += $(call ldflags_for_lib, xcb, xcb)
+LIBS += $(call ldflags_for_lib, xcursor, Xcursor)
+LIBS += $(call ldflags_for_lib, x11, X11)
+LIBS += $(call ldflags_for_lib, yajl, yajl)
+LIBS += $(call ldflags_for_lib, libev, ev)
 
 ifeq ($(UNAME),NetBSD)
 # We need -idirafter instead of -I to prefer the system’s iconv over GNU libiconv
@@ -75,12 +75,12 @@ endif
 
 ifeq ($(UNAME),OpenBSD)
 CFLAGS += -I${X11BASE}/include
-LDFLAGS += -liconv
+LIBS += -liconv
 LDFLAGS += -L${X11BASE}/lib
 endif
 
 ifeq ($(UNAME),FreeBSD)
-LDFLAGS += -liconv
+LIBS += -liconv
 endif
 
 # Fallback for libyajl 1 which did not include yajl_version.h. We need
@@ -102,7 +102,7 @@ endif
 
 ifeq ($(COVERAGE),1)
 CFLAGS += -fprofile-arcs -ftest-coverage
-LDFLAGS += -lgcov
+LIBS += -lgcov
 endif
 
 # Don’t print command lines which are run

diff --git a/i3-config-wizard/Makefile b/i3-config-wizard/Makefile
index 51b030f2fceee29369211f9c54c1f2f3acb1bc09..688df11a81d27a4dc4b1f0f07714828e16a505b5 100644 (file)
--- a/i3-config-wizard/Makefile
+++ b/i3-config-wizard/Makefile
@@ -15,7 +15,7 @@ HEADERS:=$(wildcard *.h)
 
 all: cfgparse.y.o cfgparse.yy.o ${FILES}
        echo "LINK i3-config-wizard"
-       $(CC) -o i3-config-wizard $^ $(LDFLAGS)
+       $(CC) $(LDFLAGS) -o i3-config-wizard $^ $(LIBS)
 
 cfgparse.yy.o: cfgparse.l cfgparse.y.o ${HEADERS}
        echo "LEX $<"

diff --git a/i3-input/Makefile b/i3-input/Makefile
index 12658dcdb3533b0a42ae28301693c9c6821432fc..498cfb50f620c45ef1736c81f1506797d12aae31 100644 (file)
--- a/i3-input/Makefile
+++ b/i3-input/Makefile
@@ -14,7 +14,7 @@ HEADERS=$(wildcard *.h)
 
 all: ${FILES}
        echo "LINK i3-input"
-       $(CC) -o i3-input ${FILES} $(LDFLAGS)
+       $(CC) $(LDFLAGS) -o i3-input ${FILES} $(LIBS)
 
 install: all
        echo "INSTALL"

diff --git a/i3-msg/Makefile b/i3-msg/Makefile
index 29de92635f37f293f93c666270dfc32629e0fd72..7ea19e604a4b9b98c68fc407dcf6bfcfb2ba3d6f 100644 (file)
--- a/i3-msg/Makefile
+++ b/i3-msg/Makefile
@@ -16,7 +16,7 @@ HEADERS=$(wildcard *.h)
 
 all: ${FILES}
        echo "LINK i3-msg"
-       $(CC) -o i3-msg ${FILES} $(LDFLAGS)
+       $(CC) $(LDFLAGS) -o i3-msg ${FILES} $(LIBS)
 
 install: all
        echo "INSTALL"

diff --git a/i3-nagbar/Makefile b/i3-nagbar/Makefile
index 76b1ca4c7eec809bb165410204533180b4e694e9..c9eec446c8b054cb20e62d4b3db640d209bfaf68 100644 (file)
--- a/i3-nagbar/Makefile
+++ b/i3-nagbar/Makefile
@@ -14,7 +14,7 @@ HEADERS=$(wildcard *.h)
 
 all: ${FILES}
        echo "LINK i3-nagbar"
-       $(CC) -o i3-nagbar ${FILES} $(LDFLAGS)
+       $(CC) $(LDFLAGS) -o i3-nagbar ${FILES} $(LIBS)
 
 install: all
        echo "INSTALL"