shrimpx above miklos?

[chaz/openbox] / build / Makefile.cwmcc

diff --git a/build/Makefile.cwmcc b/build/Makefile.cwmcc
index 4e17a7dda4f521ada7d9ffcda187fe1462520204..7ad7961570e6724f7ab1ba266c1831395c4a5e96 100644 (file)
--- 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 prop.c client_props.c root_props.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))