X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=build%2FMakefile.kernel;h=a58798e244a4b6e80f21b53fd395817f87b55e01;hb=b3ed490e8f4c438535a2cf6be1600242e1031440;hp=c539dbf92f36ad9fbbee725aedfb0fd782882df0;hpb=e040fc1b94e9a4c40fe41ba96b459d2275718cfd;p=chaz%2Fopenbox

diff --git a/build/Makefile.kernel b/build/Makefile.kernel
index c539dbf9..a58798e2 100644
--- a/build/Makefile.kernel
+++ b/build/Makefile.kernel
@@ -4,32 +4,33 @@ 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 dispatch.c engine.c event.c group.c \
+sources = action.c client.c config.c dispatch.c engine.c event.c group.c \
           extensions.c focus.c frame.c grab.c menu.c openbox.c \
           parse.c plugin.c prop.c screen.c stacking.c timer.c xerror.c \
           parse.lex.c parse.tab.c
 
 srcdir := $(srcdir)/$(dir)
 target := $(addprefix $(dir)/,$(target))
-objects := $(addprefix $(dir)/,$(sources:.c=.o))
+objects := $(addprefix $(dir)/,$(sources:.c=.lo))
 sources := $(addprefix $(srcdir)/,$(sources))
-deps := $(addprefix $(depdir)/,$(objects:.o=.d))
+deps := $(addprefix $(depdir)/,$(objects:.lo=.d))
 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
 $(srcdir)/%.c: $(srcdir)/%.y
 	@
 
-$(dir)/%.o: $(srcdir)/%.c $(depdir)/%.d
+$(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d
 	$(COMPILE) -c -o $@ $<
 
 %.lex.c: %.l
@@ -41,11 +42,12 @@ $(dir)/%.o: $(srcdir)/%.c $(depdir)/%.d
 $(depdir)/%.d: $(srcdir)/%.c
 	@echo Building dependancies for $<
 	$(INSTALL) -d $(depdir)
-	@$(CC) $(CPPFLAGS) $(CFLAGS) -w -MM -MF $@ -MQ $(<:.c=.o) $<
+	@$(CC) $(CPPFLAGS) $(CFLAGS) -w -MM -MF $@ -MQ $(<:.c=.lo) $<
 
 install:
 	$(INSTALL) -d $(DESTDIR)$(bindir)/
-	$(INSTALL) $(target) $(DESTDIR)$(bindir)/$(notdir $(target))
+	$(LIBTOOL) --mode=install $(INSTALL) $(target) \
+		$(DESTDIR)$(bindir)/$(notdir $(target))
 
 uninstall:
 	-$(RM) $(DESTDIR)$(bindir)/$(notdir $(target))