More autoconf work

[collectd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 35f24cb1a8b5258e1f7d926bf25d0643cf5ba56a..83b0d647b31d07cb1bdbdd73db4e4923f39dec32 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,8 @@
-ACLOCAL_AMFLAGS = -I libltdl/m4
+ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = libltdl src bindings .
+SUBDIRS = proto src bindings .
 
-AM_CPPFLAGS = $(LTDLINCL)
-
-EXTRA_DIST = contrib version-gen.sh
+EXTRA_DIST = contrib version-gen.sh testwrapper.sh
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
@@ -12,6 +10,5 @@ install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
 
 maintainer-clean-local:
-       -rm -f -r libltdl
        -rm -f INSTALL
        -rm -f aclocal.m4