diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | examples/channel/Makefile.am | 16 | ||||
| -rw-r--r-- | examples/channel/abis_ipa_stream_client.c (renamed from examples/channel/abis_ipa_client.c) | 0 | ||||
| -rw-r--r-- | examples/channel/abis_ipa_stream_server.c (renamed from examples/channel/abis_ipa_server.c) | 0 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/channel/Makefile.am | 9 | ||||
| -rw-r--r-- | src/channel/abis/Makefile.am | 8 | ||||
| -rw-r--r-- | src/channel/abis/ipa_stream_client.c (renamed from src/channel/abis_ipa_client.c) | 0 | ||||
| -rw-r--r-- | src/channel/abis/ipa_stream_server.c (renamed from src/channel/abis_ipa_server.c) | 0 |
9 files changed, 19 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 946629b..411eec9 100644 --- a/configure.ac +++ b/configure.ac @@ -53,6 +53,7 @@ AC_OUTPUT( include/osmocom/netif/channel/Makefile src/Makefile src/channel/Makefile + src/channel/abis/Makefile examples/Makefile examples/channel/Makefile Makefile) diff --git a/examples/channel/Makefile.am b/examples/channel/Makefile.am index eb53c41..6ab34b6 100644 --- a/examples/channel/Makefile.am +++ b/examples/channel/Makefile.am @@ -2,13 +2,13 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) -noinst_PROGRAMS = abis_ipa_server \ - abis_ipa_client +noinst_PROGRAMS = abis_ipa_stream_server \ + abis_ipa_stream_client -abis_ipa_server_SOURCES = abis_ipa_server.c -abis_ipa_server_LDADD = $(top_builddir)/src/libosmonetif.la \ - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) +abis_ipa_stream_server_SOURCES = abis_ipa_stream_server.c +abis_ipa_stream_server_LDADD = $(top_builddir)/src/libosmonetif.la \ + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -abis_ipa_client_SOURCES = abis_ipa_client.c -abis_ipa_client_LDADD = $(top_builddir)/src/libosmonetif.la \ - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) +abis_ipa_stream_client_SOURCES = abis_ipa_stream_client.c +abis_ipa_stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \ + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) diff --git a/examples/channel/abis_ipa_client.c b/examples/channel/abis_ipa_stream_client.c index 3e24b62..3e24b62 100644 --- a/examples/channel/abis_ipa_client.c +++ b/examples/channel/abis_ipa_stream_client.c diff --git a/examples/channel/abis_ipa_server.c b/examples/channel/abis_ipa_stream_server.c index a1b2ffd..a1b2ffd 100644 --- a/examples/channel/abis_ipa_server.c +++ b/examples/channel/abis_ipa_stream_server.c diff --git a/src/Makefile.am b/src/Makefile.am index ea204b5..ec93de4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = channel lib_LTLIBRARIES = libosmonetif.la -libosmonetif_la_LIBADD = channel/libosmonetif-channel.la +libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la libosmonetif_la_SOURCES = amr.c \ channel.c \ diff --git a/src/channel/Makefile.am b/src/channel/Makefile.am index 3839734..1c4b7a9 100644 --- a/src/channel/Makefile.am +++ b/src/channel/Makefile.am @@ -1,8 +1 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) - -noinst_LTLIBRARIES = libosmonetif-channel.la - -libosmonetif_channel_la_SOURCES = abis_ipa_server.c \ - abis_ipa_client.c +SUBDIRS = abis diff --git a/src/channel/abis/Makefile.am b/src/channel/abis/Makefile.am new file mode 100644 index 0000000..3c6fef6 --- /dev/null +++ b/src/channel/abis/Makefile.am @@ -0,0 +1,8 @@ +INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) +AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) + +noinst_LTLIBRARIES = libosmonetif-abis.la + +libosmonetif_abis_la_SOURCES = ipa_stream_server.c \ + ipa_stream_client.c diff --git a/src/channel/abis_ipa_client.c b/src/channel/abis/ipa_stream_client.c index bb6a1ee..bb6a1ee 100644 --- a/src/channel/abis_ipa_client.c +++ b/src/channel/abis/ipa_stream_client.c diff --git a/src/channel/abis_ipa_server.c b/src/channel/abis/ipa_stream_server.c index 6524033..6524033 100644 --- a/src/channel/abis_ipa_server.c +++ b/src/channel/abis/ipa_stream_server.c |