diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile.cwmcc | 3 | ||||
| -rw-r--r-- | build/Makefile.kernel | 7 | ||||
| -rw-r--r-- | build/Makefile.obcl | 3 | ||||
| -rw-r--r-- | build/Makefile.render | 3 |
4 files changed, 10 insertions, 6 deletions
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)) |