aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@flameeyes.eu>2012-06-30 15:22:56 -0700
committerHarald Welte <laforge@gnumonks.org>2012-07-01 07:40:35 +0200
commit62f0e0612a0b63092b91a3c1e6588abcf8a7ff0a (patch)
tree79fbc6396d87d2dbcebe468ce35c60328b23cefc
parent584672e8f4f009b7050e7617835cdcfcf525daf5 (diff)
build: use LT_INIT([pic-only]) instead of forcing -fPIC in AM_CFLAGS.
Also contextually remove the AC_PROG_LIBTOOL call (which is an obsolete name for what is now LT_INIT). Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
-rw-r--r--configure.ac3
-rw-r--r--src/Makefile.am2
-rw-r--r--src/input/Makefile.am2
-rw-r--r--src/trau/Makefile.am2
4 files changed, 4 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index f90da49..5be721f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,8 +11,7 @@ dnl checks for programs
AC_PROG_MAKE_SET
AC_PROG_CC
AC_PROG_INSTALL
-LT_INIT
-AC_PROG_LIBTOOL
+LT_INIT([pic-only])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/src/Makefile.am b/src/Makefile.am
index 7aaa046..2155a76 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS=input trau
LIBVERSION=1:0:0
INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
+AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS)
lib_LTLIBRARIES = libosmoabis.la
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 9937465..309fe9d 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = libosmoabis-input.la
INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
+AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS)
libosmoabis_input_la_SOURCES = dahdi.c \
diff --git a/src/trau/Makefile.am b/src/trau/Makefile.am
index 47b5875..71a219c 100644
--- a/src/trau/Makefile.am
+++ b/src/trau/Makefile.am
@@ -4,7 +4,7 @@
LIBVERSION=0:0:0
INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS= -fPIC -Wall \
+AM_CFLAGS= -Wall \
$(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) \
$(ORTP_CFLAGS) $(COVERAGE_CFLAGS)
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \