X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=Makefile.am;h=03bdd39a3500abf9cd514b02881583510b392238;hp=b52b0e9309da9fe889237f70034039e231b18928;hb=ad0a12907bf80b4f0deec217b8379dd08c490dbc;hpb=1584314f015f98abc61e74fdd6e47e200c8d02aa

diff --git a/Makefile.am b/Makefile.am
index b52b0e93..03bdd39a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +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 .
+
+AM_CPPFLAGS = $(LTDLINCL)
+
+EXTRA_DIST = contrib version-gen.sh testwrapper.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