wmii

commit d6c806a01f9b9208724f2f5c57675de0b4a0d1d0
parent fc901891333c740c6ca753628ef7656150f09cff
Author: Kris Maglione <kris@suckless.org>
Date:   Wed,  2 Jun 2010 17:31:08 -0400

Don't statically link wmiir. Broken on newer x86_64 glibc systems.

Diffstat:
alternative_wmiircs/python/pyxp/mux.py
 | 
1
-
alternative_wmiircs/python/wmiirc.py
 | 
9
++++++---
cmd/Makefile
 | 
8
++------

3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/alternative_wmiircs/python/pyxp/mux.py b/alternative_wmiircs/python/pyxp/mux.py
@@ -106,7 +106,6 @@ class Mux(object):
         if async:
             self.muxer = async
             t = Thread(target=self.mux, args=(async,))
-            t.daemon = True
             t.start()
 
     def dispatch(self, dat):
diff --git a/alternative_wmiircs/python/wmiirc.py b/alternative_wmiircs/python/wmiirc.py
@@ -18,6 +18,9 @@ identity = lambda k: k
 # Configuration should be placed in that file, and this file
 # left unmodified, if possible. wmiirc_local should import
 # wmiirc or any other modules it needs.
+#
+# Do *not* copy this file to wmiirc_local.py lest you want it
+# executed twice.
 
 # Keys
 keys.defs = dict(
@@ -96,9 +99,9 @@ events.bind({
 
     'Notice':       lambda args: notice.show(args),
 
-    Match(('LeftBarClick', 'LeftBarDND'), '1'): lambda e, b, tag: tags.select(tag),
-    Match('LeftBarClick', '4'): lambda *a: tags.select(tags.next(True)),
-    Match('LeftBarClick', '5'): lambda *a: tags.select(tags.next()),
+    Match(('LeftBarClick', 'LeftBarDND'), 1): lambda e, b, tag: tags.select(tag),
+    Match('LeftBarClick', 4): lambda *a: tags.select(tags.next(True)),
+    Match('LeftBarClick', 5): lambda *a: tags.select(tags.next()),
 
     Match('LeftBarMouseDown', 3):   lambda e, n, tag: clickmenu((
             ('Delete',     lambda t: Tag(t).delete()),
diff --git a/cmd/Makefile b/cmd/Makefile
@@ -14,17 +14,13 @@ TARG =	wihack    \
 	wmii9menu \
 	wmiir
 
-LIBS += $(LIBS9)
+LIBS += $(LIBS9) $(LIBIXP)
 CFLAGS += $(INCX11)
 
 include $(ROOT)/mk/many.mk
 include $(ROOT)/mk/dir.mk
 
-OWMIIR=wmiir.o $(OFILES) $(LIBIXP)
-wmiir.out: $(OWMIIR)
-	$(LINK) $@ $(STATIC) $(OWMIIR)
-
 O9MENU=wmii9menu.o $(ROOT)/lib/libstuff.a $(LIBIXP)
 wmii9menu.out: $(O9MENU)
-	$(LINK) $@ $(O9MENU) $$(pkg-config --libs $(X11PACKAGES) xrandr xinerama) -lXext
+	$(LINK) $@ $(O9MENU) $$(pkg-config --libs $(X11PACKAGES)) -lXext