nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

buld fixes for the new libs

Browse source
This commit is contained in:
Dana Jansens 2003-04-09 18:36:01 +00:00
parent d0e9015651
commit 787cbcf656
5 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/Makefile.cwmcc
View file

@ -17,7 +17,7 @@ depdir := $(depdir)/$(dir)
all: $(target) all: $(target)
$(target): $(objects) $(target): $(objects)
$(LINK) -o $@ $^ $(LDFLAGS) $(LINK) -rpath $(libdir) -o $@ $^ $(LDFLAGS)
$(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d $(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d
$(LTCOMPILE) -c -o $@ $< $(LTCOMPILE) -c -o $@ $<
@ -31,6 +31,7 @@ install:
$(INSTALL) -d $(DESTDIR)$(libdir)/ $(INSTALL) -d $(DESTDIR)$(libdir)/
$(LIBTOOL) --mode=install $(INSTALL) $(target) \ $(LIBTOOL) --mode=install $(INSTALL) $(target) \
$(DESTDIR)$(libdir)/$(notdir $(target)) $(DESTDIR)$(libdir)/$(notdir $(target))
$(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
uninstall: uninstall:
$(LTRM) $(DESTDIR)$(libdir)/$(notdir $(target)) $(LTRM) $(DESTDIR)$(libdir)/$(notdir $(target))

7
build/Makefile.kernel
View file

@ -4,8 +4,9 @@ dir = kernel
CPPFLAGS += $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(XFT_CFLAGS) $(X_CFLAGS) \ CPPFLAGS += $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(XFT_CFLAGS) $(X_CFLAGS) \
-DG_LOG_DOMAIN=\"Openbox\" -DG_LOG_DOMAIN=\"Openbox\"
LIBS += $(GLIB_LIBS) $(GMODULE_LIBS) $(XFT_LIBS) $(X_LIBS) $(XINERAMA_LIBS) LIBS += $(GLIB_LIBS) $(GMODULE_LIBS) $(XFT_LIBS) $(X_LIBS) $(XINERAMA_LIBS) \
LDFLAGS += -export-dynamic -lobrender
LDFLAGS += -Lrender -export-dynamic
target = openbox3 target = openbox3
sources = action.c client.c config.c dispatch.c engine.c event.c group.c \ sources = action.c client.c config.c dispatch.c engine.c event.c group.c \
@ -22,7 +23,7 @@ depdir := $(depdir)/$(dir)
all: $(target) all: $(target)
$(target): $(objects) render/librender.a $(target): $(objects) render/libobrender.la
$(LINK) -o $@ $^ $(LIBS) $(LDFLAGS) $(LINK) -o $@ $^ $(LIBS) $(LDFLAGS)
# kill the implicit .c.y rule # kill the implicit .c.y rule

3
build/Makefile.obcl
View file

@ -17,7 +17,7 @@ depdir := $(depdir)/$(dir)
all: $(target) all: $(target)
$(target): $(objects) $(target): $(objects)
$(LINK) -o $@ $^ $(LDFLAGS) $(LINK) -rpath $(libdir) -o $@ $^ $(LDFLAGS)
$(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d $(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d
$(LTCOMPILE) -c -o $@ $< $(LTCOMPILE) -c -o $@ $<
@ -31,6 +31,7 @@ install:
$(INSTALL) -d $(DESTDIR)$(libdir)/ $(INSTALL) -d $(DESTDIR)$(libdir)/
$(LIBTOOL) --mode=install $(INSTALL) $(target) \ $(LIBTOOL) --mode=install $(INSTALL) $(target) \
$(DESTDIR)$(libdir)/$(notdir $(target)) $(DESTDIR)$(libdir)/$(notdir $(target))
$(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
uninstall: uninstall:
$(LTRM) $(DESTDIR)$(libdir)/$(notdir $(target)) $(LTRM) $(DESTDIR)$(libdir)/$(notdir $(target))

3
build/Makefile.render
View file

@ -17,7 +17,7 @@ depdir := $(depdir)/$(dir)
all: $(target) all: $(target)
$(target): $(objects) $(target): $(objects)
$(LINK) -o $@ $^ $(LDFLAGS) $(LINK) -rpath $(libdir) -o $@ $^ $(LDFLAGS)
$(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d $(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d
$(LTCOMPILE) -c -o $@ $< $(LTCOMPILE) -c -o $@ $<
@ -31,6 +31,7 @@ install:
$(INSTALL) -d $(DESTDIR)$(libdir)/ $(INSTALL) -d $(DESTDIR)$(libdir)/
$(LIBTOOL) --mode=install $(INSTALL) $(target) \ $(LIBTOOL) --mode=install $(INSTALL) $(target) \
$(DESTDIR)$(libdir)/$(notdir $(target)) $(DESTDIR)$(libdir)/$(notdir $(target))
$(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
uninstall: uninstall:
$(LTRM) $(DESTDIR)$(libdir)/$(notdir $(target)) $(LTRM) $(DESTDIR)$(libdir)/$(notdir $(target))

2
plugins/keyboard/keyboard.c
View file

@ -149,8 +149,6 @@ static void event(ObEvent *e, void *foo)
p->action->data.cycle.cancel = 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 && if (p->action->func == action_cycle_windows &&