3 files changed, 13 insertions, 53 deletions
diff --git a/render/.cvsignore b/render/.cvsignore
index 41200f78..12e915ba 100644
--- a/render/.cvsignore
+++ b/render/.cvsignore
@@ -1,16 +1,14 @@
 rendertest
 librender.a
 .libs
-color.lo
-font.lo
-gradient.lo
-image.lo
-mask.lo
-render.lo
-test.lo
+render_libobrender_la-color.lo
+render_libobrender_la-font.lo
+render_libobrender_la-gradient.lo
+render_libobrender_la-image.lo
+render_libobrender_la-mask.lo
+render_libobrender_la-render.lo
 libobrender.la
-theme.lo
-Makefile.in
+render_libobrender_la-theme.lo
 .deps
-Makefile
-instance.lo
+render_libobrender_la-instance.lo
+.dirstamp
diff --git a/render/Makefile b/render/Makefile
new file mode 100644
index 00000000..b90edacf
--- /dev/null
+++ b/render/Makefile
@@ -0,0 +1,4 @@
+all clean install:
+	$(MAKE) -C .. -$(MAKEFLAGS) $@
+
+.PHONY: all clean install
diff --git a/render/Makefile.am b/render/Makefile.am
deleted file mode 100644
index 49e9b4f9..00000000
--- a/render/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-themedir=$(datadir)/openbox/themes
-
-theme=operation
-
-AM_CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) \
-            -DG_LOG_DOMAIN=\"Render\" \
-            -DDEFAULT_THEME=\"$(theme)\" \
-            -DTHEMEDIR=\"$(themedir)\"
-
-INCLUDES=-I..
-LIBS=$(XFT_LIBS) $(GLIB_LIBS) $(GL_LIBS) @LIBS@
-
-noinst_PROGRAMS=rendertest
-rendertest_LDFLAGS=-lobrender -L.
-rendertest_SOURCES=test.c
-
-lib_LTLIBRARIES=libobrender.la
-libobrender_la_SOURCES=\
-  color.h \
-  color.c \
-  font.h \
-  font.c \
-  gradient.h \
-  gradient.c \
-  image.h \
-  image.c \
-  mask.h \
-  mask.c \
-  render.h \
-  render.c \
-  theme.h \
-  theme.c \
-  instance.h \
-  instance.c
-
-
-noinst_HEADERS=render.h gradient.h color.h font.h mask.h image.h
-
-MAINTAINERCLEANFILES=Makefile.in
-
-distclean-local:
-	$(RM) *\~ *.orig *.rej .\#*