From 9db3ef8f545b1c24c0bbc45754049ee64bea991a Mon Sep 17 00:00:00 2001
From: Kris Maglione <kris@suckless.org>
Date: Mon, 26 Oct 2009 15:27:43 -0400
Subject: [PATCH] Gmake.

---
 cmd/Makefile       | 2 +-
 cmd/click/Makefile | 2 +-
 cmd/menu/Makefile  | 2 +-
 cmd/strut/Makefile | 2 +-
 cmd/wmii/Makefile  | 2 +-
 config.mk          | 2 +-
 debian/rules       | 3 ---
 mk/hdr.mk          | 4 ++--
 8 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/cmd/Makefile b/cmd/Makefile
index 5cc6e55d..13b9cf9f 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -14,7 +14,7 @@ TARG =	wihack    \
 
 OFILES = util.o
 
-LDFLAGS += $(LIBS9)
+LIBS += $(LIBS9)
 CFLAGS += $(INCX11)
 
 include $(ROOT)/mk/many.mk
diff --git a/cmd/click/Makefile b/cmd/click/Makefile
index a170999a..1abf6cb1 100644
--- a/cmd/click/Makefile
+++ b/cmd/click/Makefile
@@ -10,7 +10,7 @@ HFILES=	dat.h fns.h
 PACKAGES += $(X11PACKAGES) xext xrandr xrender xinerama
 
 LIB =	$(LIBIXP)
-LDFLAGS += -lm -lXtst $(LIBS9)
+LIBS += -lm -lXtst $(LIBS9)
 CFLAGS += -DVERSION=\"$(VERSION)\" -DIXP_NEEDAPI=86
 OBJ =	main	\
 	_util	\
diff --git a/cmd/menu/Makefile b/cmd/menu/Makefile
index ab70cf01..a2fc9ad3 100644
--- a/cmd/menu/Makefile
+++ b/cmd/menu/Makefile
@@ -15,7 +15,7 @@ HFILES=	dat.h fns.h
 PACKAGES += $(X11PACKAGES) xext xrandr xrender xinerama
 
 LIB =	$(LIBIXP)
-LDFLAGS += -lm $(LIBS9)
+LIBS += -lm $(LIBS9)
 CFLAGS += -DIXP_NEEDAPI=86
 OBJ =	main	\
 	caret	\
diff --git a/cmd/strut/Makefile b/cmd/strut/Makefile
index 65af3de5..fca4bd2f 100644
--- a/cmd/strut/Makefile
+++ b/cmd/strut/Makefile
@@ -10,7 +10,7 @@ HFILES=	dat.h fns.h
 PACKAGES += $(X11PACKAGES) xext xrandr xinerama
 
 LIB =	$(LIBIXP)
-LDFLAGS += -lm $(LIBS9)
+LIBS += -lm $(LIBS9)
 CFLAGS += -DIXP_NEEDAPI=86
 OBJ =	main	\
 	event	\
diff --git a/cmd/wmii/Makefile b/cmd/wmii/Makefile
index 60eb686e..f89b182c 100644
--- a/cmd/wmii/Makefile
+++ b/cmd/wmii/Makefile
@@ -10,7 +10,7 @@ HFILES=	dat.h fns.h
 PACKAGES += $(X11PACKAGES) xext xrandr xrender xinerama
 
 LIB =	$(LIBIXP)
-LDFLAGS += -lm $(LIBS9)
+LIBS += -lm $(LIBS9)
 
 CFLAGS += $(INCICONV) -DIXP_NEEDAPI=97
 OBJ =	area	\
diff --git a/config.mk b/config.mk
index eefa07eb..59d52a71 100644
--- a/config.mk
+++ b/config.mk
@@ -18,7 +18,7 @@ TERMINAL = xterm
 # Flags
 include $(ROOT)/mk/gcc.mk
 CFLAGS += $(DEBUGCFLAGS) -O0
-LDFLAGS += -g $(LIBS)
+LDFLAGS += -g
 SOLDFLAGS += $(LDFLAGS)
 SHARED = -shared -Wl,-soname=$(SONAME)
 STATIC = -static
diff --git a/debian/rules b/debian/rules
index 2357b13f..663cc258 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,3 @@ override_dh_auto_install:
 
 	install -D img/icon.png debian/wmii/usr/share/icons/wmii.png
 
-unexport CFLAGS
-unexport LDFLAGS
-
diff --git a/mk/hdr.mk b/mk/hdr.mk
index 39d1dcd9..ef1e2d4a 100644
--- a/mk/hdr.mk
+++ b/mk/hdr.mk
@@ -5,8 +5,8 @@ EXCFLAGS = $(INCLUDES) -D_XOPEN_SOURCE=600
 COMPILE    = $(ROOT)/util/compile "$(CC)" "$(EXCFLAGS) $(CFLAGS) $$(pkg-config --cflags $(PACKAGES))"
 COMPILEPIC = $(ROOT)/util/compile "$(CC)" "$(EXCFLAGS) $(CFLAGS) $$(pkg-config --cflags $(PACKAGES)) $(SOCFLAGS)"
 
-LINK   = $(ROOT)/util/link "$(LD)" "$$(pkg-config --libs $(PACKAGES)) $(LDFLAGS)"
-LINKSO = $(ROOT)/util/link "$(LD)" "$$(pkg-config --libs $(PACKAGES)) $(SOLDFLAGS) $(SHARED)"
+LINK   = $(ROOT)/util/link "$(LD)" "$$(pkg-config --libs $(PACKAGES)) $(LDFLAGS) $(LIBS)"
+LINKSO = $(ROOT)/util/link "$(LD)" "$$(pkg-config --libs $(PACKAGES)) $(SOLDFLAGS) $(LIBS) $(SHARED)"
 
 CLEANNAME=$(ROOT)/util/cleanname