[hackers] [wmii] Gmake. || Kris Maglione

changeset: 2575:529a390c6775
tag: tip
user: Kris Maglione <kris_AT_suckless.org>
date: Mon Oct 26 15:27:43 2009 -0400
files: cmd/Makefile cmd/click/Makefile cmd/menu/Makefile cmd/strut/Makefile cmd/wmii/Makefile config.mk debian/rules mk/hdr.mk
description:
Gmake.

diff -r 70224f3da9a6 -r 529a390c6775 cmd/Makefile
--- a/cmd/Makefile Sun Oct 25 23:29:48 2009 -0400
+++ b/cmd/Makefile Mon Oct 26 15:27:43 2009 -0400
@@ -14,7 +14,7 @@
 
 OFILES = util.o
 
-LDFLAGS += $(LIBS9)
+LIBS += $(LIBS9)
 CFLAGS += $(INCX11)
 
 include $(ROOT)/mk/many.mk
diff -r 70224f3da9a6 -r 529a390c6775 cmd/click/Makefile
--- a/cmd/click/Makefile Sun Oct 25 23:29:48 2009 -0400
+++ b/cmd/click/Makefile Mon Oct 26 15:27:43 2009 -0400
@@ -10,7 +10,7 @@
 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 -r 70224f3da9a6 -r 529a390c6775 cmd/menu/Makefile
--- a/cmd/menu/Makefile Sun Oct 25 23:29:48 2009 -0400
+++ b/cmd/menu/Makefile Mon Oct 26 15:27:43 2009 -0400
@@ -15,7 +15,7 @@
 PACKAGES += $(X11PACKAGES) xext xrandr xrender xinerama
 
 LIB = $(LIBIXP)
-LDFLAGS += -lm $(LIBS9)
+LIBS += -lm $(LIBS9)
 CFLAGS += -DIXP_NEEDAPI=86
 OBJ = main \
         caret \
diff -r 70224f3da9a6 -r 529a390c6775 cmd/strut/Makefile
--- a/cmd/strut/Makefile Sun Oct 25 23:29:48 2009 -0400
+++ b/cmd/strut/Makefile Mon Oct 26 15:27:43 2009 -0400
@@ -10,7 +10,7 @@
 PACKAGES += $(X11PACKAGES) xext xrandr xinerama
 
 LIB = $(LIBIXP)
-LDFLAGS += -lm $(LIBS9)
+LIBS += -lm $(LIBS9)
 CFLAGS += -DIXP_NEEDAPI=86
 OBJ = main \
         event \
diff -r 70224f3da9a6 -r 529a390c6775 cmd/wmii/Makefile
--- a/cmd/wmii/Makefile Sun Oct 25 23:29:48 2009 -0400
+++ b/cmd/wmii/Makefile Mon Oct 26 15:27:43 2009 -0400
@@ -10,7 +10,7 @@
 PACKAGES += $(X11PACKAGES) xext xrandr xrender xinerama
 
 LIB = $(LIBIXP)
-LDFLAGS += -lm $(LIBS9)
+LIBS += -lm $(LIBS9)
 
 CFLAGS += $(INCICONV) -DIXP_NEEDAPI=97
 OBJ = area \
diff -r 70224f3da9a6 -r 529a390c6775 config.mk
--- a/config.mk Sun Oct 25 23:29:48 2009 -0400
+++ b/config.mk Mon Oct 26 15:27:43 2009 -0400
@@ -18,7 +18,7 @@
 # Flags
 include $(ROOT)/mk/gcc.mk
 CFLAGS += $(DEBUGCFLAGS) -O0
-LDFLAGS += -g $(LIBS)
+LDFLAGS += -g
 SOLDFLAGS += $(LDFLAGS)
 SHARED = -shared -Wl,-soname=$(SONAME)
 STATIC = -static
diff -r 70224f3da9a6 -r 529a390c6775 debian/rules
--- a/debian/rules Sun Oct 25 23:29:48 2009 -0400
+++ b/debian/rules Mon Oct 26 15:27:43 2009 -0400
@@ -18,6 +18,3 @@
 
         install -D img/icon.png debian/wmii/usr/share/icons/wmii.png
 
-unexport CFLAGS
-unexport LDFLAGS
-
diff -r 70224f3da9a6 -r 529a390c6775 mk/hdr.mk
--- a/mk/hdr.mk Sun Oct 25 23:29:48 2009 -0400
+++ b/mk/hdr.mk Mon Oct 26 15:27:43 2009 -0400
@@ -5,8 +5,8 @@
 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
 
Received on Mon Oct 26 2009 - 19:29:18 UTC