X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Makefile.am;h=03bdd39a3500abf9cd514b02881583510b392238;hb=a349e06f0c4e2c853eced8a2621f52ee712b6e0c;hp=30beb6397998679dfb342bf03f770e06522b97f4;hpb=a22cddf5c82d3ac69f06f950cc05bba51c5ef7bb;p=collectd.git

diff --git a/Makefile.am b/Makefile.am
index 30beb639..03bdd39a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,23 @@
-SUBDIRS = libltdl src
-INCLUDES = $(LTDLINCL)
+ACLOCAL_AMFLAGS = -I libltdl/m4
 
-EXTRA_DIST = collectd.spec contrib debian
+SUBDIRS =
 
-dist-hook:
-	find $(distdir) -type d -name '.svn' | xargs rm -rf
+if BUILD_INCLUDED_LTDL
+SUBDIRS += libltdl
+endif
+
+SUBDIRS += proto src bindings .
+
+AM_CPPFLAGS = $(LTDLINCL)
+
+EXTRA_DIST = contrib version-gen.sh testwrapper.sh
 
 install-exec-hook:
-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
 	$(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