[med-svn] [libdisorder] 01/02: Fixed autoconf stuff, thanks a lot to Christian Seiler <christian at iwakd.de>

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libdisorder.

commit b0520f61c4627df793903e11219a05ee5b4558de
Author: Andreas Tille <tille at debian.org>
Date:   Mon Jun 27 21:54:08 2016 +0200

    Fixed autoconf stuff, thanks a lot to Christian Seiler <christian at iwakd.de>
---
 debian/patches/autoconf.patch | 86 +++++++------------------------------------
 1 file changed, 14 insertions(+), 72 deletions(-)

diff --git a/debian/patches/autoconf.patch b/debian/patches/autoconf.patch
index 9fab9f0..288cc57 100644
--- a/debian/patches/autoconf.patch
+++ b/debian/patches/autoconf.patch
@@ -4,18 +4,22 @@ Description: Add autoconf stuff to enable simple library creation
 
 --- /dev/null
 +++ b/Makefile.am
-@@ -0,0 +1,8 @@
+@@ -0,0 +1,12 @@
 +lib_LTLIBRARIES  = libdisorder.la
-+
++libdisorder_la_SOURCES = src/disorder.c
 +libdisorder_la_LDFLAGS = -version-info @LIB_VERSION@
++libdisorder_la_CPPFLAGS = -Iinclude
++libdisorder_la_LIBADD = -lm
 +
-+libdisorder_la_CPPFLAGS = $(INCLUDES)
-+
-+LDADD = -ldisorder
++bin_PROGRAMS = ropy
++ropy_SOURCES = tool/ropy.c
++ropy_LDADD = libdisorder.la
 +
++include_HEADERS = include/disorder.h
++man_MANS = man/shannon_H.3
 --- /dev/null
 +++ b/configure.ac
-@@ -0,0 +1,63 @@
+@@ -0,0 +1,62 @@
 +#                                               -*- Autoconf -*-
 +# Process this file with autoconf to produce a configure script.
 +
@@ -33,7 +37,7 @@ Description: Add autoconf stuff to enable simple library creation
 +################################################################################
 +AC_CONFIG_MACRO_DIR(config)
 +
-+AM_INIT_AUTOMAKE([1.6 foreign dist-zip tar-ustar filename-length-max=299])
++AM_INIT_AUTOMAKE([1.6 foreign subdir-objects dist-zip tar-ustar filename-length-max=299])
 +
 +LIB_VERSION=0:0
 +
@@ -45,7 +49,9 @@ Description: Add autoconf stuff to enable simple library creation
 +# Checks for programs.
 +AC_PROG_LN_S
 +AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
++
++LT_PREREQ(2.2)
++LT_INIT
 +
 +################################################################################
 +# calling AC_PROG_CXX resets CXXFLAGS, we use our own flags set in the
@@ -73,70 +79,6 @@ Description: Add autoconf stuff to enable simple library creation
 +
 +AC_CONFIG_FILES([
 +	Makefile
-+        include/Makefile
-+        src/Makefile
-+        tool/Makefile
 +	])
 +AC_OUTPUT
 +
---- a/src/Makefile
-+++ /dev/null
-@@ -1,37 +0,0 @@
--LDFLAGS=-L../lib -L/usr/lib
--INCLUDES=-I/usr/include -I../include
--LIBS=-ldisorder -lm
--#OPTS=-Wall -g -pg
--OPTS=-Wall -g
--TESTOUT=../test/testexec
--TESTSRC=../test/test.c
--TOOLOUT=../tool/ropy
--TOOLSRC=../tool/ropy.c
--
--all:	disorder library test tool
--
--library: libdisorder.a
--
--libdisorder.a: disorder.o
--	ar rc $@ disorder.o
--	mkdir -p ../lib
--	mv libdisorder.a ../lib
--
--disorder: disorder.c ../include/disorder.h
--	gcc $(OPTS) -c disorder.c
--
--test:	../test/test.c
--	gcc $(OPTS) $(LDFLAGS) $(INCLUDES) -o $(TESTOUT) $(TESTSRC) $(LIBS)
--
--tool:	../tool/ropy.c
--	gcc $(OPTS) $(LDFLAGS) $(INCLUDES) -o $(TOOLOUT) $(TOOLSRC) $(LIBS)
--
--clean:
--	@/bin/rm -f *~ *.o *.a $(TESTOUT) $(TOOLOUT)
--	@/bin/rm -f ../test/*~
--	@/bin/rm -f ../tool/*~
--	@/bin/rm -Rf ../test/testexec.dSYM/
--	@/bin/rm -Rf ../tool/ropy.dSYM/
--	@/bin/rm -f ../include/*~
--	@/bin/rm -f ../lib/*.a
--	@/bin/rm -f ../*~
-\ No newline at end of file
---- /dev/null
-+++ b/include/Makefile.am
-@@ -0,0 +1,2 @@
-+libdisorderdir=$(includedir)
-+libdisorder_HEADERS=disorder.h
---- /dev/null
-+++ b/man/Makefile.am
-@@ -0,0 +1 @@
-+man_MANS = shannon_H.3
---- /dev/null
-+++ b/src/Makefile.am
-@@ -0,0 +1,2 @@
-+libdisorder_la_SOURCES = disorder.c
-+
---- /dev/null
-+++ b/tool/Makefile.am
-@@ -0,0 +1,3 @@
-+bin_PROGRAMS = ropy
-+ropy_SOURCES = ropy.c
-+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libdisorder.git