File libstelephony-01-simplify-autoinit.diff of Package wanpipe

Overview Repositories Revisions Requests Users Attributes Meta

File libstelephony-01-simplify-autoinit.diff of Package wanpipe

From: Jan Engelhardt <jengelh@medozas.de>
Date: 2011-10-27 16:56:41.562271223 +0200
Upstream: tbd

build: simplify autotools initialization

There is no need to call the tools one by one.

Using "foreign" automake option allows to get rid of zero-length
files AUTHORS, COPYING, ChangeLog, NEWS, INSTALL.

One of bootstrap/init-automake.sh is redundant.

---
 api/libstelephony/Makefile.am      |    3 ---
 api/libstelephony/configure.in     |    2 +-
 api/libstelephony/init-automake.sh |   26 ++------------------------
 3 files changed, 3 insertions(+), 28 deletions(-)

Index: wanpipe-3.5.23.6/api/libstelephony/Makefile.am
===================================================================
--- wanpipe-3.5.23.6.orig/api/libstelephony/Makefile.am
+++ wanpipe-3.5.23.6/api/libstelephony/Makefile.am
@@ -13,8 +13,5 @@ lib_LTLIBRARIES = libstelephony.la
 include_HEADERS = libstelephony.h 
 
 libstelephony_la_SOURCES = libstelephony.cpp PToneDecoder.cpp PToneEncoder.cpp Q931EventsDecoder.cpp stelephony.cpp stel_tone/stel_tone.c stel_tone/wp_uart.c stel_tone/wp_libteletone_generate.c stel_tone/wp_libteletone_detect.c stel_tone/wp_fsk.c
-
-libstelephony_la_CFLAGS    = $(AM_CFLAGS)
-libstelephony_la_CXXFLAGS  = $(AM_CXXFLAGS)
 libstelephony_la_LDFLAGS   = -version-info 1:0:0
 
Index: wanpipe-3.5.23.6/api/libstelephony/configure.in
===================================================================
--- wanpipe-3.5.23.6.orig/api/libstelephony/configure.in
+++ wanpipe-3.5.23.6/api/libstelephony/configure.in
@@ -4,7 +4,7 @@
 AC_PREREQ(2.59)
 AC_INIT(libstelephony, 2.0.0)
 AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([-Wall foreign])
 
 # Checks for programs.
 AC_PROG_CC
Index: wanpipe-3.5.23.6/api/libstelephony/init-automake.sh
===================================================================
--- wanpipe-3.5.23.6.orig/api/libstelephony/init-automake.sh
+++ wanpipe-3.5.23.6/api/libstelephony/init-automake.sh
@@ -1,28 +1,6 @@
-#!/bin/sh
-
-PWD=$(pwd)
-
-eval "autoheader"
-if [ $? -ne 0 ]; then
-	exit $?
-fi
-eval "libtoolize --force"
-if [ $? -ne 0 ]; then
-	exit $?
-fi
-eval "aclocal"
-if [ $? -ne 0 ]; then
-	exit $?
-fi
-eval "automake -a"
-if [ $? -ne 0 ]; then
-	exit $?
-fi
-eval "autoconf"
-if [ $? -ne 0 ]; then
-	exit $?
-fi
+#!/bin/sh -e
 
+autoreconf -fi
 echo "Automake Init Done"
 echo

Places

File libstelephony-01-simplify-autoinit.diff of Package wanpipe

Places