X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Makefile.am;h=c63893fe6727945b946db37e486b2338e96dc7e4;hb=c6ff2298206ce78a6f2c7772f3bf413af8d44311;hp=9a96eb27c8594f65ae0079f6bbe48e74a4e0faaa;hpb=cb72a2216def7a5935e28644684df73e68a83425;p=collectd.git

diff --git a/Makefile.am b/Makefile.am
index 9a96eb27..c63893fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,23 @@
-SUBDIRS = libltdl src bindings
+ACLOCAL_AMFLAGS = -I libltdl/m4
 
-INCLUDES = $(LTDLINCL)
+SUBDIRS =
 
-EXTRA_DIST = contrib version-gen.sh
+if BUILD_INCLUDED_LTDL
+SUBDIRS += libltdl
+endif
+
+SUBDIRS += proto src bindings .
 
-dist-hook:
-	find $(distdir) -type d -name '.svn' | xargs rm -rf
+AM_CPPFLAGS = $(LTDLINCL)
+
+EXTRA_DIST = contrib version-gen.sh
 
 install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
 	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME)
+	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
+
+maintainer-clean-local:
+	-rm -f -r libltdl
+	-rm -f INSTALL
+	-rm -f aclocal.m4