doc: add missing -lm option to command line for compiling tut1

[comedilib.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8a75b7b587bf413d17477bd9f4cc1c8563cded85..f4361776cdd45e64985874b078d696238e45fd11 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 
-SUBDIRS = lib comedi_calibrate comedi_config man testing demo doc swig \
-       include etc scxi
+SUBDIRS = lib comedi_config man testing demo comedi_board_info doc swig \
+       include etc scxi c++
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = comedilib.pc
@@ -8,7 +8,7 @@ pkgconfig_DATA = comedilib.pc
 ## with automake 1.8, putting the m4 directory in EXTRA_DIST is not needed, and
 ## causes 'make distcheck' to fail, by way of 'make distdir' failing when builddir != srcdir 
 ## and srcdir is read-only.
-EXTRA_DIST = debian comedilib.spec autogen.sh
+EXTRA_DIST = comedilib.spec autogen.sh perl
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -16,7 +16,20 @@ ACLOCAL_AMFLAGS = -I m4
 DISTCHECK_CONFIGURE_FLAGS = RUBY_PREFIX='$${prefix}' --disable-ruby-binding
 
 dist-hook:
-       rm -rf `find $(distdir) -name CVS`
+       @if test -d "$(srcdir)/.git"; \
+       then \
+               echo Creating ChangeLog && \
+               ( cd "$(top_srcdir)" && \
+                 echo '# Generated by Makefile.  Do not edit.'; echo; \
+                 $(top_srcdir)/missing --run \
+                 git log --stat --name-only --date=iso ) \
+                > ChangeLog.tmp \
+               && mv -f ChangeLog.tmp $(distdir)/ChangeLog \
+               || ( rm -f ChangeLog.tmp ; \
+                    echo Failed to generate ChangeLog >&2 ); \
+       else \
+               echo A git clone is required to generate a ChangeLog >&2; \
+       fi
 
 dev:
        -for i in `seq 0 15`; do \