X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Makefile.am;h=b79ea1cabfbdc562cfcd46983771b1351d6a5d23;hb=daa5c7a886b4406d5b8bfdbecd6f998f9ca07fea;hp=5015b66e0744ba9abce18757c118d669f65b90d8;hpb=6d59888c5be1c19400d1fac98860d3839a239811;p=collectd.git

diff --git a/Makefile.am b/Makefile.am
index 5015b66e..b79ea1ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,23 @@
-SUBDIRS = libltdl src
+ACLOCAL_AMFLAGS = -I libltdl/m4
 
-INCLUDES = $(LTDLINCL)
+SUBDIRS =
 
-EXTRA_DIST = collectd.spec contrib
+if BUILD_INCLUDED_LTDL
+SUBDIRS += libltdl
+endif
 
-dist-hook:
-	find $(distdir) -type d -name '.svn' | xargs rm -rf
+SUBDIRS += src bindings .
+
+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