1 Jul
2012
1 Jul
'12
12:22 a.m.
automake is well capable of building sources present in sub-directory
without requiring a recursion, so there is no reason to use a
non-installed library just for the extra files.
Signed-off-by: Diego Elio Pettenò <flameeyes(a)flameeyes.eu>
---
configure.ac | 1 -
src/Makefile.am | 12 +++++++++---
src/input/Makefile.am | 13 -------------
3 files changed, 9 insertions(+), 17 deletions(-)
delete mode 100644 src/input/Makefile.am
diff --git a/configure.ac b/configure.ac
index f1da635..2c04240 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,6 @@ AC_OUTPUT(
libosmotrau.pc
include/Makefile
src/Makefile
- src/input/Makefile
src/trau/Makefile
tests/Makefile
Makefile)
diff --git a/src/Makefile.am b/src/Makefile.am
index 2155a76..a13223e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=input trau
+SUBDIRS=trau
# This is _NOT_ the library release version, it's an API version.
# Please read Chapter 6 "Library interface versions" of the libtool
documentation before making any modification
@@ -10,10 +10,16 @@ AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS)
$(COVERAG
lib_LTLIBRARIES = libosmoabis.la
-libosmoabis_la_LIBADD = input/libosmoabis-input.la
libosmoabis_la_SOURCES = init.c \
e1_input.c \
e1_input_vty.c \
ipa_proxy.c \
subchan_demux.c \
- trau_frame.c
+ trau_frame.c \
+ input/dahdi.c \
+ input/hsl.c \
+ input/ipa.c \
+ input/ipaccess.c \
+ input/lapd.c \
+ input/misdn.c \
+ input/rs232.c
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
deleted file mode 100644
index 309fe9d..0000000
--- a/src/input/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-noinst_LTLIBRARIES = libosmoabis-input.la
-
-INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-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 \
- hsl.c \
- ipa.c \
- ipaccess.c \
- lapd.c \
- misdn.c \
- rs232.c
--
1.7.8.6