X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=build%2FMakefile.render;h=e47afa2a58e80616e63d55f6b33dc6422d7484e7;hb=5cf61ee02354c1c9f80c11f3796afc4b948055d6;hp=58b2d5dbfc94dd6681599adc70db180ebf5b5480;hpb=d0e9015651aa960cf8cb58a5ab08da79e6aeb51b;p=chaz%2Fopenbox

diff --git a/build/Makefile.render b/build/Makefile.render
index 58b2d5db..e47afa2a 100644
--- a/build/Makefile.render
+++ b/build/Makefile.render
@@ -1,11 +1,13 @@
 include build/Makefile.incl
 
 dir = render
+theme = operation
 
-CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Render\"
+CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Render\" \
+            -DDEFAULT_THEME=\"$(theme)\" -DTHEMEDIR=\"$(themedir)\"
 
 target = libobrender.la
-sources = color.c font.c gradient.c image.c mask.c render.c test.c
+sources = color.c font.c gradient.c image.c mask.c render.c theme.c
 
 srcdir := $(srcdir)/$(dir)
 target := $(addprefix $(dir)/, $(target))
@@ -17,7 +19,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 $@ $<
@@ -25,12 +27,13 @@ $(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d
 $(depdir)/%.d: $(srcdir)/%.c
 	@echo Building dependancies for $<
 	@$(INSTALL) -d $(depdir)
-	@$(DEPCOMPILE) -w -MM -MF $@ -MQ $(<:.c=.o) $<
+	@$(DEPCOMPILE) -w -MM -MF $@ -MQ $(<:.c=.lo) $<
 
 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))