buld fixes for the new libs
Dana Jansens danakj@orodu.net
5 files changed,
11 insertions(+),
9 deletions(-)
M
build/Makefile.cwmcc
→
build/Makefile.cwmcc
@@ -17,7 +17,7 @@
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))
M
build/Makefile.kernel
→
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
M
build/Makefile.obcl
→
build/Makefile.obcl
@@ -17,7 +17,7 @@
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))
M
build/Makefile.render
→
build/Makefile.render
@@ -17,7 +17,7 @@
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))
M
plugins/keyboard/keyboard.c
→
plugins/keyboard/keyboard.c
@@ -149,9 +149,7 @@ p->action->data.cycle.final = FALSE;
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) {