X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=build%2FMakefile.cwmcc;h=8ee2e77ddbe4d1a6b9cc0cc9eb7f14d2ed2736cf;hb=d8fc08f33d5148be6294a8469066cf6a4604e940;hp=4e17a7dda4f521ada7d9ffcda187fe1462520204;hpb=d0e9015651aa960cf8cb58a5ab08da79e6aeb51b;p=chaz%2Fopenbox

diff --git a/build/Makefile.cwmcc b/build/Makefile.cwmcc
index 4e17a7dd..8ee2e77d 100644
--- a/build/Makefile.cwmcc
+++ b/build/Makefile.cwmcc
@@ -3,9 +3,10 @@ include build/Makefile.incl
 dir = cwmcc
 
 CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"CWMCC\"
+LIBS += $(GLIB_LIBS)
 
 target = libcwmcc.la
-sources = cwmcc.c
+sources = cwmcc.c atom.c
 
 srcdir := $(srcdir)/$(dir)
 target := $(addprefix $(dir)/, $(target))
@@ -17,7 +18,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 +26,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))