X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Makefile.am;h=c63893fe6727945b946db37e486b2338e96dc7e4;hb=42ca41a0798e3a2b742f7da3bacc03fbaf6175fa;hp=b52b0e9309da9fe889237f70034039e231b18928;hpb=8057cd230cbc322e17f7435732ea5b73eef1fa08;p=collectd.git

diff --git a/Makefile.am b/Makefile.am
index b52b0e93..c63893fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,14 @@
-SUBDIRS = libltdl src bindings
+ACLOCAL_AMFLAGS = -I libltdl/m4
 
-INCLUDES = $(LTDLINCL)
+SUBDIRS =
+
+if BUILD_INCLUDED_LTDL
+SUBDIRS += libltdl
+endif
+
+SUBDIRS += proto src bindings .
+
+AM_CPPFLAGS = $(LTDLINCL)
 
 EXTRA_DIST = contrib version-gen.sh
 
@@ -8,3 +16,8 @@ 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