[hackers] [wmii] Fix debian build. Closes issue #143. || Kris Maglione

changeset: 2573:02e77b2213fb
tag: tip
user: Kris Maglione <kris_AT_suckless.org>
date: Sun Oct 25 17:05:55 2009 -0400
files: Makefile cmd/Makefile cmd/click/Makefile cmd/menu/Makefile cmd/strut/Makefile cmd/wmii/Makefile debian/patches/01-config-local-mk.patch debian/rules mk/common.mk mk/hdr.mk mk/wmii.mk
description:
Fix debian build. Closes issue #143.

diff -r 63df7cb7ae7b -r 02e77b2213fb Makefile
--- a/Makefile Sun Oct 25 14:57:21 2009 -0400
+++ b/Makefile Sun Oct 25 17:05:55 2009 -0400
@@ -30,7 +30,7 @@
         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_AT_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 -r 63df7cb7ae7b -r 02e77b2213fb cmd/Makefile
--- a/cmd/Makefile Sun Oct 25 14:57:21 2009 -0400
+++ b/cmd/Makefile Sun Oct 25 17:05:55 2009 -0400
@@ -14,7 +14,7 @@
 
 OFILES = util.o
 
-LDFLAGS += -lfmt -lutf
+LDFLAGS += $(LIBS9)
 CFLAGS += $(INCX11)
 
 include $(ROOT)/mk/many.mk
@@ -29,5 +29,5 @@
 
 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 -r 63df7cb7ae7b -r 02e77b2213fb cmd/click/Makefile
--- a/cmd/click/Makefile Sun Oct 25 14:57:21 2009 -0400
+++ b/cmd/click/Makefile Sun Oct 25 17:05:55 2009 -0400
@@ -10,7 +10,7 @@
 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 -r 63df7cb7ae7b -r 02e77b2213fb cmd/menu/Makefile
--- a/cmd/menu/Makefile Sun Oct 25 14:57:21 2009 -0400
+++ b/cmd/menu/Makefile Sun Oct 25 17:05:55 2009 -0400
@@ -15,7 +15,7 @@
 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 -r 63df7cb7ae7b -r 02e77b2213fb cmd/strut/Makefile
--- a/cmd/strut/Makefile Sun Oct 25 14:57:21 2009 -0400
+++ b/cmd/strut/Makefile Sun Oct 25 17:05:55 2009 -0400
@@ -10,7 +10,7 @@
 PACKAGES += $(X11PACKAGES) xext xrandr xinerama
 
 LIB = $(LIBIXP)
-LDFLAGS += -lm -lregexp9 -lbio -lfmt -lutf
+LDFLAGS += -lm $(LIBS9)
 CFLAGS += -DIXP_NEEDAPI=86
 OBJ = main \
         event \
diff -r 63df7cb7ae7b -r 02e77b2213fb cmd/wmii/Makefile
--- a/cmd/wmii/Makefile Sun Oct 25 14:57:21 2009 -0400
+++ b/cmd/wmii/Makefile Sun Oct 25 17:05:55 2009 -0400
@@ -10,7 +10,7 @@
 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 -r 63df7cb7ae7b -r 02e77b2213fb debian/patches/01-config-local-mk.patch
--- a/debian/patches/01-config-local-mk.patch Sun Oct 25 14:57:21 2009 -0400
+++ b/debian/patches/01-config-local-mk.patch Sun Oct 25 17:05:55 2009 -0400
@@ -6,8 +6,8 @@
 --- /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 -r 63df7cb7ae7b -r 02e77b2213fb debian/rules
--- a/debian/rules Sun Oct 25 14:57:21 2009 -0400
+++ b/debian/rules Sun Oct 25 17:05:55 2009 -0400
@@ -18,3 +18,6 @@
 
         install -D img/icon.png debian/wmii/usr/share/icons/wmii.png
 
+unexport CFLAGS
+unexport LDFLAGS
+
diff -r 63df7cb7ae7b -r 02e77b2213fb mk/common.mk
--- a/mk/common.mk Sun Oct 25 14:57:21 2009 -0400
+++ b/mk/common.mk Sun Oct 25 17:05:55 2009 -0400
@@ -30,9 +30,5 @@
         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 -r 63df7cb7ae7b -r 02e77b2213fb mk/hdr.mk
--- a/mk/hdr.mk Sun Oct 25 14:57:21 2009 -0400
+++ b/mk/hdr.mk Sun Oct 25 17:05:55 2009 -0400
@@ -38,6 +38,7 @@
 .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 @@
                  else $(FILTER) <$$2 >$(DESTDIR)$$3; \
                  fi; \
                  chmod $$1 $(DESTDIR)$$3; \
+ set +x; \
          }; _install
 UNINSTALL= _uninstall() { set -e; \
                    echo UNINSTALL $$($(CLEANNAME) $(BASE)$$2); \
diff -r 63df7cb7ae7b -r 02e77b2213fb mk/wmii.mk
--- a/mk/wmii.mk Sun Oct 25 14:57:21 2009 -0400
+++ b/mk/wmii.mk Sun Oct 25 17:05:55 2009 -0400
@@ -6,6 +6,8 @@
 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; \
Received on Sun Oct 25 2009 - 21:06:08 UTC