From: Dana Jansens <danakj@orodu.net>
Date: Wed, 9 Apr 2003 18:36:01 +0000 (+0000)
Subject: buld fixes for the new libs
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=787cbcf656890fae77fd3e6bef8e2d0cfc669ee8;hp=d0e9015651aa960cf8cb58a5ab08da79e6aeb51b;p=chaz%2Fopenbox

buld fixes for the new libs
---

diff --git a/build/Makefile.cwmcc b/build/Makefile.cwmcc
index 4e17a7dd..5593519c 100644
--- a/build/Makefile.cwmcc
+++ b/build/Makefile.cwmcc
@@ -17,7 +17,7 @@ depdir := $(depdir)/$(dir)
 all: $(target)
 
 $(target): $(objects)
-	$(LINK) -o $@ $^ $(LDFLAGS)
+	$(LINK) -rpath $(libdir) -o $@ $^ $(LDFLAGS)
 
 $(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d
 	$(LTCOMPILE) -c -o $@ $<
@@ -31,6 +31,7 @@ install:
 	$(INSTALL) -d $(DESTDIR)$(libdir)/
 	$(LIBTOOL) --mode=install $(INSTALL) $(target) \
 		$(DESTDIR)$(libdir)/$(notdir $(target))
+	$(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
 
 uninstall:
 	$(LTRM) $(DESTDIR)$(libdir)/$(notdir $(target))
diff --git a/build/Makefile.kernel b/build/Makefile.kernel
index 7adfdfec..a5e79c66 100644
--- a/build/Makefile.kernel
+++ b/build/Makefile.kernel
@@ -4,8 +4,9 @@ dir = kernel
 
 CPPFLAGS += $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(XFT_CFLAGS) $(X_CFLAGS) \
             -DG_LOG_DOMAIN=\"Openbox\"
-LIBS += $(GLIB_LIBS) $(GMODULE_LIBS) $(XFT_LIBS) $(X_LIBS) $(XINERAMA_LIBS)
-LDFLAGS += -export-dynamic
+LIBS += $(GLIB_LIBS) $(GMODULE_LIBS) $(XFT_LIBS) $(X_LIBS) $(XINERAMA_LIBS) \
+	-lobrender
+LDFLAGS += -Lrender -export-dynamic
 
 target = openbox3
 sources = action.c client.c config.c dispatch.c engine.c event.c group.c \
@@ -22,7 +23,7 @@ depdir := $(depdir)/$(dir)
 
 all: $(target)
 
-$(target): $(objects) render/librender.a
+$(target): $(objects) render/libobrender.la
 	$(LINK) -o $@ $^ $(LIBS) $(LDFLAGS)
 
 # kill the implicit .c.y rule
diff --git a/build/Makefile.obcl b/build/Makefile.obcl
index c602c686..5e40384e 100644
--- a/build/Makefile.obcl
+++ b/build/Makefile.obcl
@@ -17,7 +17,7 @@ depdir := $(depdir)/$(dir)
 all: $(target)
 
 $(target): $(objects)
-	$(LINK) -o $@ $^ $(LDFLAGS)
+	$(LINK) -rpath $(libdir) -o $@ $^ $(LDFLAGS)
 
 $(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d
 	$(LTCOMPILE) -c -o $@ $<
@@ -31,6 +31,7 @@ install:
 	$(INSTALL) -d $(DESTDIR)$(libdir)/
 	$(LIBTOOL) --mode=install $(INSTALL) $(target) \
 		$(DESTDIR)$(libdir)/$(notdir $(target))
+	$(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
 
 uninstall:
 	$(LTRM) $(DESTDIR)$(libdir)/$(notdir $(target))
diff --git a/build/Makefile.render b/build/Makefile.render
index 58b2d5db..6f99e524 100644
--- a/build/Makefile.render
+++ b/build/Makefile.render
@@ -17,7 +17,7 @@ depdir := $(depdir)/$(dir)
 all: $(target)
 
 $(target): $(objects)
-	$(LINK) -o $@ $^ $(LDFLAGS)
+	$(LINK) -rpath $(libdir) -o $@ $^ $(LDFLAGS)
 
 $(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d
 	$(LTCOMPILE) -c -o $@ $<
@@ -31,6 +31,7 @@ install:
 	$(INSTALL) -d $(DESTDIR)$(libdir)/
 	$(LIBTOOL) --mode=install $(INSTALL) $(target) \
 		$(DESTDIR)$(libdir)/$(notdir $(target))
+	$(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
 
 uninstall:
 	$(LTRM) $(DESTDIR)$(libdir)/$(notdir $(target))
diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index ef367172..81809649 100644
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -149,9 +149,7 @@ static void event(ObEvent *e, void *foo)
                             p->action->data.cycle.cancel = FALSE;
                         }
 
-                        if (!grabbed_key ||
-                            p->action->func == action_cycle_windows)
-                            p->action->func(&p->action->data);
+                        p->action->func(&p->action->data);
 
                         if (p->action->func == action_cycle_windows &&
                             !grabbed_key) {