[Pkg-voip-commits] [dahdi-tools] 229/285: automake: add basic libtool support

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master
in repository dahdi-tools.

commit 6df9a492a01565f715935f43b9b7c2009b726a06
Author: Oron Peled <oron.peled at xorcom.com>
Date:   Sun Dec 7 14:00:42 2014 -0500

    automake: add basic libtool support
    
    * Also:
      - Add libtool-related files into "make dist"
      - Update .gitignore
    
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
---
 .gitignore            | 11 +++++++++--
 Makefile.am           |  8 ++++++++
 build_tools/make_dist | 12 +++++++++++-
 configure.ac          |  2 +-
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index ad7f4e7..1249c51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,16 @@
 *~
 *.o
+*.lo
+*.a
+*.so
+*.la
 .*.o.d
 .*.lo.d
 *.asciidoc
 *.html
+.deps
+.libs
+.dirstamp
 Makefile
 Makefile.in
 auxdir/
@@ -32,8 +39,8 @@ hdlcgen
 hdlcstress
 hdlctest
 hdlcverify
-libtonezone.a
-libtonezone.so
+libtool
+m4/
 makeopts
 patgen
 patlooptest
diff --git a/Makefile.am b/Makefile.am
index 0f1a852..6dc1595 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,4 +24,12 @@ docs config:
 
 DISTCLEANFILES	= makeopts config.log config.status .*.d
 
+MAINTAINERCLEANFILES	= \
+		m4/libtool.m4 \
+		m4/ltoptions.m4 \
+		m4/ltsugar.m4 \
+		m4/ltversion.m4 \
+		m4/lt~obsolete.m4 \
+		#
+
 .PHONY: docs config
diff --git a/build_tools/make_dist b/build_tools/make_dist
index e00e88e..26af271 100755
--- a/build_tools/make_dist
+++ b/build_tools/make_dist
@@ -30,10 +30,20 @@ extra_dist='
 	ppp/Makefile.in
 	Makefile.in
 	xpp/Makefile.in
+	xpp/oct612x/Makefile.in
+	auxdir/compile
+	auxdir/config.guess
+	auxdir/config.sub
+	auxdir/depcomp
 	auxdir/install-sh
+	auxdir/ltmain.sh
 	auxdir/missing
+	m4/libtool.m4
+	m4/ltoptions.m4
+	m4/ltsugar.m4
+	m4/ltversion.m4
+	m4/lt~obsolete.m4
 	'
-
 find $extra_dist | cpio -pudmv "$tmp_version_dir"
 tar czf "$output" -C "$tmp_work_dir" "$tarball_prefix"
 rm -rf "$tmp_work_dir"
diff --git a/configure.ac b/configure.ac
index 3be3861..b4c2a5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,8 +55,8 @@ AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_PROG_RANLIB
 AC_PROG_AWK
+AC_PROG_LIBTOOL
 AST_CHECK_GNU_MAKE
 
 test_obj=conftest.o

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/dahdi-tools.git