merge the C branch into HEAD

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 23cfc45ab4b08e85c1c6209f9ce0bdc5c5f000eb..aff7de323e96b58cdaad7c6cce68ff880c93d802 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,15 @@
-# Makefile.am for Openbox
-
-SUBDIRS = data doc nls src util
+SUBDIRS = po data themes doc render kernel engines python
 MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
 
-uninstall-local:
-       -rmdir $(pkgdatadir)
+.PHONY: doc
+
+doc:
+       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc
 
 distclean-local:
-       rm -f *\~ gmon.out
+       rm -f *\~ gmon.out .\#*
+
+ACLOCAL_AMFLAGS = -I m4
+
+EXTRA_DIST = config.rpath mkinstalldirs INSTALL README \
+             COPYING AUTHORS CHANGELOG