build: avoid using a convenience library for the input subdirectory.

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@flameeyes.eu>
This commit is contained in:
Diego Elio Pettenò 2012-06-30 15:22:59 -07:00 committed by Harald Welte
parent 3dfe8bf80c
commit 05819cebc4
3 changed files with 9 additions and 17 deletions

View File

@ -45,7 +45,6 @@ AC_OUTPUT(
libosmotrau.pc
include/Makefile
src/Makefile
src/input/Makefile
src/trau/Makefile
tests/Makefile
Makefile)

View File

@ -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

View File

@ -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