merge the C branch into HEAD

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 20bfe4ad6ae69de2468173da1ee8208647a1201e..aff7de323e96b58cdaad7c6cce68ff880c93d802 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = po data doc otk wrap src scripts
+SUBDIRS = po data themes doc render kernel engines python
 MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
 
 .PHONY: doc
@@ -6,9 +6,6 @@ MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
 doc:
        $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc
 
-uninstall-local:
-       -rmdir $(pkgdatadir)
-
 distclean-local:
        rm -f *\~ gmon.out .\#*