wmii

commit e3cf0426a1318ed88877f4bbd25b265459545d96
parent 89c937aa115b6342e8b83073b548239847f146d9
Author: Kris Maglione <kris@suckless.org>
Date:   Sun, 25 Oct 2009 17:05:55 -0400

Fix debian build. Closes issue #143.

Diffstat:
Makefile
 | 
2
+-
cmd/Makefile
 | 
4
++--
cmd/click/Makefile
 | 
2
+-
cmd/menu/Makefile
 | 
2
+-
cmd/strut/Makefile
 | 
2
+-
cmd/wmii/Makefile
 | 
2
+-
debian/patches/01-config-local-mk.patch
 | 
4
++--
debian/rules
 | 
3
+++
mk/common.mk
 | 
4
----
mk/hdr.mk
 | 
2
++
mk/wmii.mk
 | 
2
++

11 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ deb:
 	then hg tip --template 'wmii-hg ($(VERSION)) $(DISTRO); urgency=low\n\n  * {desc}\n\n -- {author}  {date|rfc822date}\n'; \
 	else awk 'BEGIN{"date"|getline; print "wmii-hg ($(VERSION)) $(DISTRO); urgency=low\n\n  * Upstream build\n\n -- Kris Maglione <jg@suckless.org>  "$$0"\n"}'; \
 	fi >debian/changelog
-	dpkg-buildpackage -rfakeroot
+	dpkg-buildpackage -rfakeroot -b -nc
 	[ -d .hg ] && hg revert debian/changelog
 
 include ${ROOT}/mk/dir.mk
diff --git a/cmd/Makefile b/cmd/Makefile
@@ -14,7 +14,7 @@ TARG =	wihack    \
 
 OFILES = util.o
 
-LDFLAGS += -lfmt -lutf
+LDFLAGS += $(LIBS9)
 CFLAGS += $(INCX11)
 
 include $(ROOT)/mk/many.mk
@@ -29,5 +29,5 @@ wmii/x11.o wmii/xext.o wmii/geom.o wmii/map.o: dall
 
 O9MENU=wmii9menu.o clientutil.o wmii/x11.o wmii/xext.o wmii/geom.o wmii/map.o $(OFILES) $(LIBIXP)
 wmii9menu.out: $(O9MENU)
-	$(LINK) $@ $(O9MENU) $$(pkg-config --libs $(X11PACKAGES) xrandr xinerama) -lXext -lbio
+	$(LINK) $@ $(O9MENU) $$(pkg-config --libs $(X11PACKAGES) xrandr xinerama) -lXext
 
diff --git 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 -lregexp9 -lbio -lfmt -lutf
+LDFLAGS += -lm -lXtst $(LIBS9)
 CFLAGS += -DVERSION=\"$(VERSION)\" -DIXP_NEEDAPI=86
 OBJ =	main	\
 	_util	\
diff --git 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 -lregexp9 -lbio -lfmt -lutf
+LDFLAGS += -lm $(LIBS9)
 CFLAGS += -DIXP_NEEDAPI=86
 OBJ =	main	\
 	caret	\
diff --git 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 -lregexp9 -lbio -lfmt -lutf
+LDFLAGS += -lm $(LIBS9)
 CFLAGS += -DIXP_NEEDAPI=86
 OBJ =	main	\
 	event	\
diff --git 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 $(LIBICONV) -lregexp9 -lbio -lfmt -lutf
+LDFLAGS += -lm $(LIBS9)
 
 CFLAGS += $(INCICONV) -DIXP_NEEDAPI=97
 OBJ =	area	\
diff --git a/debian/patches/01-config-local-mk.patch b/debian/patches/01-config-local-mk.patch
@@ -6,8 +6,8 @@ new file mode 100644
 --- /dev/null
 +++ b/config.local.mk
 @@ -0,0 +1,5 @@
-+DESTDIR=./debian/wmii/
++DESTDIR=$(ROOT)/debian/wmii-hg/
 +PREFIX=/usr
 +ETC=/etc/X11
 +STATIC=
-+TERMINAL = x-terminal-emulator
++TERMINAL=x-terminal-emulator
diff --git a/debian/rules b/debian/rules
@@ -18,3 +18,6 @@ override_dh_auto_install:
 
 	install -D img/icon.png debian/wmii/usr/share/icons/wmii.png
 
+unexport CFLAGS
+unexport LDFLAGS
+
diff --git a/mk/common.mk b/mk/common.mk
@@ -30,9 +30,5 @@ tags:
 	echo CTAGS $$files $(TAGFILES) || \
 	ctags $$files $(TAGFILES)
 
-DEP:=${shell if test -f .depend;then echo .depend;else echo /dev/null; fi}
-DEP!=echo /dev/null
-include $(DEP)
-
 .PHONY: all options clean dist install uninstall depend cleandep tags
 .PHONY: simpleuninstall simpleinstall
diff --git a/mk/hdr.mk b/mk/hdr.mk
@@ -38,6 +38,7 @@ BINSH != echo /bin/sh
 .SUFFIXES: .out .o .o_pic .c .pdf .sh .rc .$(SOEXT) .awk .1 .man1 .depend .install .uninstall .clean
 all:
 
+MAKEFILES=.depend
 .c.depend:
 	echo MKDEP $<
 	[ -n "${noisycc}" ] && echo $(MKDEP) $(EXCFLAGS) $(CFLAGS) $$(pkg-config --cflags $(PACKAGES)) $< || true
@@ -81,6 +82,7 @@ INSTALL= _install() { set -e; \
 		 else $(FILTER) <$$2 >$(DESTDIR)$$3; \
 		 fi; \
 		 chmod $$1 $(DESTDIR)$$3; \
+		 set +x; \
 	 }; _install
 UNINSTALL= _uninstall() { set -e; \
 	           echo UNINSTALL $$($(CLEANNAME) $(BASE)$$2); \
diff --git a/mk/wmii.mk b/mk/wmii.mk
@@ -6,6 +6,8 @@ VERSION != echo $(VERS)
 CONFVERSION = -hg
 COPYRIGHT = ©2009 Kris Maglione
 
+LIBS9 = $(ROOT)/lib/libregexp9.a $(ROOT)/lib/libbio.a $(ROOT)/lib/libfmt.a $(ROOT)/lib/libutf.a
+
 CFLAGS += '-DVERSION=\"$(VERSION)\"' '-DCOPYRIGHT=\"$(COPYRIGHT)\"' \
 	  '-DCONFVERSION=\"$(CONFVERSION)\"' '-DCONFPREFIX=\"$(ETC)\"'
 FILTER = sed "s|@CONFPREFIX@|$(ETC)|g; \