Merge pull request #2684 from rpv-tomsk/fix-2673

[collectd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b52b0e9..03bdd39 100644 (file)
--- 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