This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
ahuemer gerrit-no-reply at lists.osmocom.org
Review at https://gerrit.osmocom.org/838
Consistenly format variables in */Makefile.am files
Change-Id: Ifa21513c007072314097b7bec188579972dc1694
---
M openbsc/Makefile.am
M openbsc/doc/Makefile.am
M openbsc/doc/examples/Makefile.am
M openbsc/include/Makefile.am
M openbsc/include/openbsc/Makefile.am
M openbsc/src/Makefile.am
M openbsc/src/gprs/Makefile.am
M openbsc/src/ipaccess/Makefile.am
M openbsc/src/libbsc/Makefile.am
M openbsc/src/libcommon/Makefile.am
M openbsc/src/libfilter/Makefile.am
M openbsc/src/libiu/Makefile.am
M openbsc/src/libmgcp/Makefile.am
M openbsc/src/libmsc/Makefile.am
M openbsc/src/libtrau/Makefile.am
M openbsc/src/osmo-bsc/Makefile.am
M openbsc/src/osmo-bsc_mgcp/Makefile.am
M openbsc/src/osmo-bsc_nat/Makefile.am
M openbsc/src/osmo-nitb/Makefile.am
M openbsc/src/utils/Makefile.am
M openbsc/tests/Makefile.am
M openbsc/tests/abis/Makefile.am
M openbsc/tests/bsc-nat/Makefile.am
M openbsc/tests/bsc/Makefile.am
M openbsc/tests/channel/Makefile.am
M openbsc/tests/db/Makefile.am
M openbsc/tests/gbproxy/Makefile.am
M openbsc/tests/gsm0408/Makefile.am
M openbsc/tests/gtphub/Makefile.am
M openbsc/tests/mgcp/Makefile.am
M openbsc/tests/mm_auth/Makefile.am
M openbsc/tests/oap/Makefile.am
M openbsc/tests/sgsn/Makefile.am
M openbsc/tests/smpp/Makefile.am
M openbsc/tests/subscr/Makefile.am
M openbsc/tests/trau/Makefile.am
M openbsc/tests/xid/Makefile.am
37 files changed, 1,526 insertions(+), 502 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/38/838/1
diff --git a/openbsc/Makefile.am b/openbsc/Makefile.am
index 8696eb4..6f76d33 100644
--- a/openbsc/Makefile.am
+++ b/openbsc/Makefile.am
@@ -1,9 +1,18 @@
-AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
+AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 $(NULL)
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-SUBDIRS = doc include src tests
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ $(NULL)
-pkgconfigdir = $(libdir)/pkgconfig
+SUBDIRS = \
+ doc \
+ include \
+ src \
+ tests \
+ $(NULL)
+
+pkgconfigdir = $(libdir)/pkgconfig $(NULL)
pkgconfig_DATA = openbsc.pc
BUILT_SOURCES = $(top_srcdir)/.version
diff --git a/openbsc/doc/Makefile.am b/openbsc/doc/Makefile.am
index aee2d7b..8acb8f8 100644
--- a/openbsc/doc/Makefile.am
+++ b/openbsc/doc/Makefile.am
@@ -1 +1,3 @@
-SUBDIRS = examples
+SUBDIRS = \
+ examples \
+ $(NULL)
diff --git a/openbsc/doc/examples/Makefile.am b/openbsc/doc/examples/Makefile.am
index 8f14fdc..530c3fa 100644
--- a/openbsc/doc/examples/Makefile.am
+++ b/openbsc/doc/examples/Makefile.am
@@ -1,4 +1,3 @@
-
CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,'
dist-hook:
diff --git a/openbsc/include/Makefile.am b/openbsc/include/Makefile.am
index 4596b6e..8ac6729 100644
--- a/openbsc/include/Makefile.am
+++ b/openbsc/include/Makefile.am
@@ -1,3 +1,8 @@
-SUBDIRS = openbsc
+SUBDIRS = \
+ openbsc \
+ $(NULL)
-noinst_HEADERS = mISDNif.h compat_af_isdn.h
+noinst_HEADERS = \
+ mISDNif.h \
+ compat_af_isdn.h \
+ $(NULL)
diff --git a/openbsc/include/openbsc/Makefile.am b/openbsc/include/openbsc/Makefile.am
index 90aa364..1cd729a 100644
--- a/openbsc/include/openbsc/Makefile.am
+++ b/openbsc/include/openbsc/Makefile.am
@@ -1,25 +1,87 @@
-noinst_HEADERS = abis_nm.h abis_rsl.h db.h gsm_04_08.h gsm_data.h \
- gsm_subscriber.h gsm_04_11.h debug.h signal.h \
- misdn.h chan_alloc.h paging.h ctrl.h \
- trau_mux.h rs232.h openbscdefines.h rtp_proxy.h \
- bsc_rll.h mncc.h transaction.h ussd.h gsm_04_80.h \
- silent_call.h mgcp.h meas_rep.h rest_octets.h \
- system_information.h handover.h mgcp_internal.h \
- vty.h socket.h e1_config.h trau_upqueue.h token_auth.h \
- handover_decision.h rrlp.h \
- crc24.h gprs_llc.h gprs_gmm.h \
- gb_proxy.h gprs_sgsn.h sgsn.h \
- auth.h osmo_msc.h bsc_msc.h bsc_nat.h \
- osmo_bsc_rf.h osmo_bsc.h network_listen.h bsc_nat_sccp.h \
- osmo_msc_data.h osmo_bsc_grace.h sms_queue.h abis_om2000.h \
- bss.h gsm_data_shared.h ipaccess.h mncc_int.h \
- arfcn_range_encode.h nat_rewrite_trie.h bsc_nat_callstats.h \
- osmux.h mgcp_transcode.h gprs_utils.h \
- gprs_gb_parse.h smpp.h meas_feed.h \
- gprs_gsup_client.h bsc_msg_filter.h \
- oap.h oap_messages.h \
- gtphub.h gprs_llc_xid.h gprs_sndcp.h \
+noinst_HEADERS = \
+ abis_nm.h \
+ abis_om2000.h \
+ abis_rsl.h \
+ arfcn_range_encode.h \
+ auth.h \
+ bsc_msc.h \
+ bsc_msg_filter.h \
+ bsc_nat.h \
+ bsc_nat_callstats.h \
+ bsc_nat_sccp.h \
+ bsc_rll.h \
+ bss.h \
+ chan_alloc.h \
+ crc24.h \
+ ctrl.h \
+ db.h \
+ debug.h \
+ e1_config.h \
+ gb_proxy.h \
+ gprs_gb_parse.h \
+ gprs_gmm.h \
+ gprs_gsup_client.h \
+ gprs_llc.h \
+ gprs_llc_xid.h \
+ gprs_sgsn.h \
+ gprs_sndcp.h \
+ gprs_utils.h \
+ gsm_04_08.h \
+ gsm_04_11.h \
+ gsm_04_80.h \
+ gsm_data.h \
+ gsm_data_shared.h \
+ gsm_subscriber.h \
+ gtphub.h \
+ handover.h \
+ handover_decision.h \
+ ipaccess.h \
iu.h
+ meas_feed.h \
+ meas_rep.h \
+ mgcp.h \
+ mgcp_internal.h \
+ mgcp_transcode.h \
+ misdn.h \
+ mncc.h \
+ mncc_int.h \
+ nat_rewrite_trie.h \
+ network_listen.h \
+ oap.h \
+ oap_messages.h \
+ openbscdefines.h \
+ osmo_bsc.h \
+ osmo_bsc_grace.h \
+ osmo_bsc_rf.h \
+ osmo_msc.h \
+ osmo_msc_data.h \
+ osmux.h \
+ paging.h \
+ rest_octets.h \
+ rrlp.h \
+ rs232.h \
+ rtp_proxy.h \
+ sgsn.h \
+ signal.h \
+ silent_call.h \
+ smpp.h \
+ sms_queue.h \
+ socket.h \
+ system_information.h \
+ token_auth.h \
+ transaction.h \
+ trau_mux.h \
+ trau_upqueue.h \
+ ussd.h \
+ vty.h \
+ $(NULL)
-openbsc_HEADERS = gsm_04_08.h meas_rep.h bsc_api.h
-openbscdir = $(includedir)/openbsc
+openbsc_HEADERS = \
+ bsc_api.h \
+ gsm_04_08.h \
+ meas_rep.h \
+ $(NULL)
+
+openbscdir = \
+ $(includedir)/openbsc \
+ $(NULL)
diff --git a/openbsc/src/Makefile.am b/openbsc/src/Makefile.am
index 4aa880f..7edfe7f 100644
--- a/openbsc/src/Makefile.am
+++ b/openbsc/src/Makefile.am
@@ -1,22 +1,59 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
-AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir) \
+ $(NULL)
+
+AM_CFLAGS = \
+ -Wall \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOVTY_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(NULL)
+
+AM_LDFLAGS = \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(COVERAGE_LDFLAGS) \
+ $(NULL)
# Libraries
-SUBDIRS = libcommon libmgcp libbsc libmsc libtrau libfilter
+SUBDIRS = \
+ libcommon \
+ libmgcp \
+ libbsc \
+ libmsc \
+ libtrau \
+ libfilter \
+ $(NULL)
# Conditional Libraries
if BUILD_IU
-SUBDIRS += libiu
+SUBDIRS += \
+ libiu \
+ $(NULL)
endif
# Programs
-SUBDIRS += osmo-nitb osmo-bsc_mgcp utils ipaccess gprs
+SUBDIRS += \
+ osmo-nitb \
+ osmo-bsc_mgcp \
+ utils \
+ ipaccess \
+ gprs \
+ $(NULL)
# Conditional Programs
if BUILD_NAT
-SUBDIRS += osmo-bsc_nat
+SUBDIRS += \
+ osmo-bsc_nat \
+ $(NULL)
endif
+
if BUILD_BSC
-SUBDIRS += osmo-bsc
+SUBDIRS += \
+ osmo-bsc \
+ $(NULL)
endif
diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am
index 6a95315..8cb4601 100644
--- a/openbsc/src/gprs/Makefile.am
+++ b/openbsc/src/gprs/Makefile.am
@@ -1,50 +1,132 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS=-Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) \
- $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOCTRL_CFLAGS) \
- $(LIBOSMOABIS_CFLAGS) $(LIBOSMOGB_CFLAGS) $(COVERAGE_CFLAGS) \
- $(LIBCARES_CFLAGS) $(LIBCRYPTO_CFLAGS) $(LIBGTP_CFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir) \
+ $(NULL)
+
+AM_CFLAGS = \
+ -Wall \
+ -fno-strict-aliasing \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOVTY_CFLAGS) \
+ $(LIBOSMOCTRL_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(LIBOSMOGB_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(LIBCARES_CFLAGS) \
+ $(LIBCRYPTO_CFLAGS) \
+ $(LIBGTP_CFLAGS) \
+ $(NULL)
+
if BUILD_IU
-AM_CFLAGS += $(LIBASN1C_CFLAGS) $(LIBOSMOSIGTRAN_CFLAGS) $(LIBOSMORANAP_CFLAGS)
+AM_CFLAGS += \
+ $(LIBASN1C_CFLAGS) \
+ $(LIBOSMOSIGTRAN_CFLAGS) \
+ $(LIBOSMORANAP_CFLAGS) \
+ $(NULL)
endif
-OSMO_LIBS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \
- $(LIBOSMOCTRL_LIBS) $(LIBOSMOGB_LIBS)
+OSMO_LIBS = \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMOVTY_LIBS) \
+ $(LIBOSMOCTRL_LIBS) \
+ $(LIBOSMOGB_LIBS) \
+ $(NULL)
-bin_PROGRAMS = osmo-gbproxy
+bin_PROGRAMS = \
+ osmo-gbproxy \
+ $(NULL)
if HAVE_LIBGTP
if HAVE_LIBCARES
-bin_PROGRAMS += osmo-sgsn osmo-gtphub
+bin_PROGRAMS += \
+ osmo-sgsn \
+ osmo-gtphub \
+ $(NULL)
endif
endif
-osmo_gbproxy_SOURCES = gb_proxy.c gb_proxy_main.c gb_proxy_vty.c \
- gb_proxy_patch.c gb_proxy_tlli.c gb_proxy_peer.c \
- gprs_gb_parse.c gprs_llc_parse.c crc24.c gprs_utils.c
-osmo_gbproxy_LDADD = $(top_builddir)/src/libcommon/libcommon.a \
- $(OSMO_LIBS) $(LIBCRYPTO_LIBS) -lrt
+osmo_gbproxy_SOURCES = \
+ gb_proxy.c \
+ gb_proxy_main.c \
+ gb_proxy_vty.c \
+ gb_proxy_patch.c \
+ gb_proxy_tlli.c \
+ gb_proxy_peer.c \
+ gprs_gb_parse.c \
+ gprs_llc_parse.c \
+ crc24.c \
+ gprs_utils.c \
+ $(NULL)
-osmo_sgsn_SOURCES = gprs_gmm.c gprs_sgsn.c gprs_sndcp.c gprs_sndcp_vty.c \
- sgsn_main.c sgsn_vty.c sgsn_libgtp.c \
- gprs_llc.c gprs_llc_parse.c gprs_llc_vty.c crc24.c \
- sgsn_ctrl.c sgsn_auth.c gprs_subscriber.c \
- gprs_utils.c gprs_gsup_client.c \
- sgsn_cdr.c sgsn_ares.c \
- oap.c oap_messages.c gprs_llc_xid.c
-osmo_sgsn_LDADD = \
- $(top_builddir)/src/libcommon/libcommon.a
+osmo_gbproxy_LDADD = \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(OSMO_LIBS) \
+ $(LIBCRYPTO_LIBS) \
+ -lrt \
+ $(NULL)
+
+osmo_sgsn_SOURCES = \
+ gprs_gmm.c \
+ gprs_sgsn.c \
+ gprs_sndcp.c \
+ gprs_sndcp_vty.c \
+ sgsn_main.c \
+ sgsn_vty.c \
+ sgsn_libgtp.c \
+ gprs_llc.c \
+ gprs_llc_parse.c \
+ gprs_llc_vty.c \
+ crc24.c \
+ sgsn_ctrl.c \
+ sgsn_auth.c \
+ gprs_subscriber.c \
+ gprs_utils.c \
+ gprs_gsup_client.c \
+ sgsn_cdr.c \
+ sgsn_ares.c \
+ oap.c \
+ oap_messages.c \
+ gprs_llc_xid.c \
+ $(NULL)
+
+osmo_sgsn_LDADD = \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(OSMO_LIBS) \
+ $(LIBOSMOABIS_LIBS) \
+ $(LIBCARES_LIBS) \
+ $(LIBCRYPTO_LIBS) \
+ -lrt \
+ -lgtp \
+ $(NULL)
+
if BUILD_IU
-osmo_sgsn_LDADD += $(top_builddir)/src/libiu/libiu.a
-endif
-osmo_sgsn_LDADD += -lgtp $(OSMO_LIBS) $(LIBOSMOABIS_LIBS) $(LIBCARES_LIBS) \
- $(LIBCRYPTO_LIBS) -lrt
-if BUILD_IU
-osmo_sgsn_LDADD += $(LIBOSMOSIGTRAN_LIBS) $(LIBOSMORANAP_LIBS) $(LIBASN1C_LIBS)
+osmo_sgsn_LDADD += \
+ $(top_builddir)/src/libiu/libiu.a \
+ $(LIBOSMOSIGTRAN_LIBS) \
+ $(LIBOSMORANAP_LIBS) \
+ $(LIBASN1C_LIBS) \
+ $(NULL)
endif
-osmo_gtphub_SOURCES = gtphub_main.c gtphub.c gtphub_sock.c gtphub_ares.c \
- gtphub_vty.c sgsn_ares.c gprs_utils.c
-osmo_gtphub_LDADD = \
- $(top_builddir)/src/libcommon/libcommon.a \
- -lgtp $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \
- $(LIBCARES_LIBS) -lrt
+osmo_gtphub_SOURCES = \
+ gtphub_main.c \
+ gtphub.c \
+ gtphub_sock.c \
+ gtphub_ares.c \
+ gtphub_vty.c \
+ sgsn_ares.c \
+ gprs_utils.c \
+ $(NULL)
+
+osmo_gtphub_LDADD = \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMOVTY_LIBS) \
+ $(LIBCARES_LIBS) \
+ -lrt \
+ -lgtp \
+ $(NULL)
diff --git a/openbsc/src/ipaccess/Makefile.am b/openbsc/src/ipaccess/Makefile.am
index 9acc0f7..f527e4d 100644
--- a/openbsc/src/ipaccess/Makefile.am
+++ b/openbsc/src/ipaccess/Makefile.am
@@ -1,26 +1,65 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS)
-AM_LDFLAGS = $(COVERAGE_LDFLAGS)
-OSMO_LIBS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOABIS_LIBS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir) \
+ $(NULL)
-bin_PROGRAMS = abisip-find ipaccess-config ipaccess-proxy
+AM_CFLAGS = \
+ -Wall \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(NULL)
-abisip_find_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libtrau/libtrau.a \
- $(top_builddir)/src/libcommon/libcommon.a \
- $(OSMO_LIBS)
-abisip_find_SOURCES = abisip-find.c
+AM_LDFLAGS = \
+ $(COVERAGE_LDFLAGS) \
+ $(NULL)
-ipaccess_config_SOURCES = ipaccess-config.c ipaccess-firmware.c network_listen.c
+OSMO_LIBS = \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMOABIS_LIBS) \
+ $(NULL)
+
+bin_PROGRAMS = \
+ abisip-find \
+ ipaccess-config \
+ ipaccess-proxy \
+ $(NULL)
+
+abisip_find_LDADD = \
+ $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libtrau/libtrau.a \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(OSMO_LIBS) \
+ $(NULL)
+
+abisip_find_SOURCES = \
+ abisip-find.c \
+ $(NULL)
+
+ipaccess_config_SOURCES = \
+ ipaccess-config.c \
+ ipaccess-firmware.c \
+ network_listen.c \
+ $(NULL)
# FIXME: resolve the bogus dependencies patched around here:
ipaccess_config_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
- $(LIBCRYPT) $(OSMO_LIBS)
+ $(LIBCRYPT) \
+ $(OSMO_LIBS) \
+ $(NULL)
-ipaccess_proxy_SOURCES = ipaccess-proxy.c
-ipaccess_proxy_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
+ipaccess_proxy_SOURCES = \
+ ipaccess-proxy.c \
+ $(NULL)
+
+ipaccess_proxy_LDADD = \
+ $(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
- $(OSMO_LIBS)
+ $(OSMO_LIBS) \
+ $(NULL)
diff --git a/openbsc/src/libbsc/Makefile.am b/openbsc/src/libbsc/Makefile.am
index fd8de0e..925ada9 100644
--- a/openbsc/src/libbsc/Makefile.am
+++ b/openbsc/src/libbsc/Makefile.am
@@ -1,28 +1,52 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) \
- $(LIBOSMOVTY_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir) \
+ $(NULL)
-noinst_LIBRARIES = libbsc.a
+AM_CFLAGS = \
+ -Wall \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOVTY_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(NULL)
-libbsc_a_SOURCES = abis_nm.c abis_nm_vty.c \
- abis_om2000.c abis_om2000_vty.c \
- abis_rsl.c bsc_rll.c \
- paging.c \
- bts_ericsson_rbs2000.c \
- bts_ipaccess_nanobts.c \
- bts_siemens_bs11.c \
- bts_nokia_site.c \
- bts_unknown.c \
- bts_sysmobts.c \
- chan_alloc.c \
- handover_decision.c handover_logic.c meas_rep.c \
- rest_octets.c system_information.c \
- e1_config.c \
- bsc_api.c bsc_msc.c bsc_vty.c \
- gsm_04_08_utils.c \
- bsc_init.c bts_init.c bsc_rf_ctrl.c \
- arfcn_range_encode.c bsc_ctrl_commands.c \
- bsc_ctrl_lookup.c \
- net_init.c \
- bsc_dyn_ts.c
+noinst_LIBRARIES = \
+ libbsc.a \
+ $(NULL)
+
+libbsc_a_SOURCES = abis_nm.c \
+ abis_nm_vty.c \
+ abis_om2000.c \
+ abis_om2000_vty.c \
+ abis_rsl.c \
+ bsc_rll.c \
+ paging.c \
+ bts_ericsson_rbs2000.c \
+ bts_ipaccess_nanobts.c \
+ bts_siemens_bs11.c \
+ bts_nokia_site.c \
+ bts_unknown.c \
+ bts_sysmobts.c \
+ chan_alloc.c \
+ handover_decision.c \
+ handover_logic.c \
+ meas_rep.c \
+ rest_octets.c \
+ system_information.c \
+ e1_config.c \
+ bsc_api.c \
+ bsc_msc.c bsc_vty.c \
+ gsm_04_08_utils.c \
+ bsc_init.c \
+ bts_init.c \
+ bsc_rf_ctrl.c \
+ arfcn_range_encode.c \
+ bsc_ctrl_commands.c \
+ bsc_ctrl_lookup.c \
+ net_init.c \
+ bsc_dyn_ts.c \
+ $(NULL)
diff --git a/openbsc/src/libcommon/Makefile.am b/openbsc/src/libcommon/Makefile.am
index 75f40ee..e508b68 100644
--- a/openbsc/src/libcommon/Makefile.am
+++ b/openbsc/src/libcommon/Makefile.am
@@ -1,9 +1,29 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) \
- $(LIBOSMOVTY_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir) \
+ $(NULL)
-noinst_LIBRARIES = libcommon.a
+AM_CFLAGS = \
+ -Wall \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOVTY_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(NULL)
-libcommon_a_SOURCES = bsc_version.c common_vty.c debug.c gsm_data.c \
- gsm_data_shared.c socket.c talloc_ctx.c \
- gsm_subscriber_base.c
+noinst_LIBRARIES = \
+ libcommon.a \
+ $(NULL)
+
+libcommon_a_SOURCES = \
+ bsc_version.c \
+ common_vty.c \
+ debug.c \
+ gsm_data.c \
+ gsm_data_shared.c \
+ socket.c \
+ talloc_ctx.c \
+ gsm_subscriber_base.c \
+ $(NULL)
diff --git a/openbsc/src/libfilter/Makefile.am b/openbsc/src/libfilter/Makefile.am
index ed3cd43..116e124 100644
--- a/openbsc/src/libfilter/Makefile.am
+++ b/openbsc/src/libfilter/Makefile.am
@@ -1,11 +1,26 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) \
- $(LIBOSMOVTY_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(COVERAGE_CFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir) \
+ $(NULL)
-noinst_LIBRARIES = libfilter.a
+AM_CFLAGS = \
+ -Wall \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOVTY_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(LIBOSMOSCCP_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(NULL)
+
+noinst_LIBRARIES = \
+ libfilter.a \
+ $(NULL)
libfilter_a_SOURCES = \
- bsc_msg_filter.c \
- bsc_msg_acc.c \
- bsc_msg_vty.c
+ bsc_msg_filter.c \
+ bsc_msg_acc.c \
+ bsc_msg_vty.c \
+ $(NULL)
diff --git a/openbsc/src/libiu/Makefile.am b/openbsc/src/libiu/Makefile.am
index 1968d3e..24bf0f4 100644
--- a/openbsc/src/libiu/Makefile.am
+++ b/openbsc/src/libiu/Makefile.am
@@ -1,10 +1,28 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) \
- $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBCRYPTO_CFLAGS) \
- $(LIBASN1C_CFLAGS) \
- $(LIBOSMOSIGTRAN_CFLAGS) $(LIBOSMORANAP_CFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir) \
+ $(NULL)
-noinst_LIBRARIES = libiu.a
+AM_CFLAGS = \
+ -Wall \
+ $(COVERAGE_CFLAGS) \
+ $(LIBCRYPTO_CFLAGS) \
+ $(LIBASN1C_CFLAGS) \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOVTY_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(LIBOSMOSIGTRAN_CFLAGS) \
+ $(LIBOSMORANAP_CFLAGS) \
+ $(NULL)
-libiu_a_SOURCES = iu.c iu_vty.c
+noinst_LIBRARIES = \
+ libiu.a \
+ $(NULL)
+
+libiu_a_SOURCES = \
+ iu.c \
+ iu_vty.c \
+ $(NULL)
diff --git a/openbsc/src/libmgcp/Makefile.am b/openbsc/src/libmgcp/Makefile.am
index 4403d60..ee9c275 100644
--- a/openbsc/src/libmgcp/Makefile.am
+++ b/openbsc/src/libmgcp/Makefile.am
@@ -1,16 +1,44 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) \
- $(LIBOSMONETIF_CFLAGS) $(COVERAGE_CFLAGS) $(LIBBCG729_CFLAGS)
-AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \
- $(LIBOSMONETIF_LIBS) $(COVERAGE_LDFLAGS) $(LIBBCG729_LIBS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir) \
+ $(NULL)
-noinst_LIBRARIES = libmgcp.a
+AM_CFLAGS = \
+ -Wall \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOVTY_CFLAGS) \
+ $(LIBOSMONETIF_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(LIBBCG729_CFLAGS) \
+ $(NULL)
-noinst_HEADERS = g711common.h
+AM_LDFLAGS = \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMONETIF_LIBS) \
+ $(COVERAGE_LDFLAGS) \
+ $(LIBBCG729_LIBS) \
+ $(NULL)
-libmgcp_a_SOURCES = mgcp_protocol.c mgcp_network.c mgcp_vty.c mgcp_osmux.c \
- mgcp_sdp.c
+noinst_LIBRARIES = \
+ libmgcp.a \
+ $(NULL)
+
+noinst_HEADERS = \
+ g711common.h \
+ $(NULL)
+
+libmgcp_a_SOURCES = \
+ mgcp_protocol.c \
+ mgcp_network.c \
+ mgcp_vty.c \
+ mgcp_osmux.c \
+ mgcp_sdp.c \
+ $(NULL)
if BUILD_MGCP_TRANSCODING
- libmgcp_a_SOURCES += mgcp_transcode.c
+libmgcp_a_SOURCES += \
+ mgcp_transcode.c \
+ $(NULL)
endif
diff --git a/openbsc/src/libmsc/Makefile.am b/openbsc/src/libmsc/Makefile.am
index 5195890..d6c1473 100644
--- a/openbsc/src/libmsc/Makefile.am
+++ b/openbsc/src/libmsc/Makefile.am
@@ -1,27 +1,58 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) \
- $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBCRYPTO_CFLAGS) $(LIBSMPP34_CFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir) \
+ $(NULL)
-noinst_HEADERS = meas_feed.h
+AM_CFLAGS = \
+ -Wall \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOVTY_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(LIBCRYPTO_CFLAGS) \
+ $(LIBSMPP34_CFLAGS) \
+ $(NULL)
-noinst_LIBRARIES = libmsc.a
+noinst_HEADERS = \
+ meas_feed.h \
+ $(NULL)
-libmsc_a_SOURCES = auth.c \
- db.c \
- gsm_04_08.c gsm_04_11.c gsm_04_11_helper.c \
- gsm_04_80.c \
- gsm_subscriber.c \
- mncc.c mncc_builtin.c mncc_sock.c \
- rrlp.c \
- silent_call.c \
- sms_queue.c \
- token_auth.c \
- ussd.c \
- vty_interface_layer3.c \
- transaction.c \
- osmo_msc.c ctrl_commands.c meas_feed.c
+noinst_LIBRARIES = \
+ libmsc.a \
+ $(NULL)
+
+libmsc_a_SOURCES = auth.c \
+ db.c \
+ gsm_04_08.c \
+ gsm_04_11.c \
+ gsm_04_11_helper.c \
+ gsm_04_80.c \
+ gsm_subscriber.c \
+ mncc.c \
+ mncc_builtin.c \
+ mncc_sock.c \
+ rrlp.c \
+ silent_call.c \
+ sms_queue.c \
+ token_auth.c \
+ ussd.c \
+ vty_interface_layer3.c \
+ transaction.c \
+ osmo_msc.c \
+ ctrl_commands.c \
+ meas_feed.c \
+ $(NULL)
if BUILD_SMPP
-noinst_HEADERS += smpp_smsc.h
-libmsc_a_SOURCES += smpp_smsc.c smpp_openbsc.c smpp_vty.c smpp_utils.c
+noinst_HEADERS += \
+ smpp_smsc.h \
+ $(NULL)
+
+libmsc_a_SOURCES += \
+ smpp_smsc.c \
+ smpp_openbsc.c \
+ smpp_vty.c \
+ smpp_utils.c \
+ $(NULL)
endif
diff --git a/openbsc/src/libtrau/Makefile.am b/openbsc/src/libtrau/Makefile.am
index 0fe3a53..5c9d5b1 100644
--- a/openbsc/src/libtrau/Makefile.am
+++ b/openbsc/src/libtrau/Makefile.am
@@ -1,7 +1,31 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMONETIF_CFLAGS) $(COVERAGE_CFLAGS)
-AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOABIS_LIBS) $(COVERAGE_LDFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir) \
+ $(NULL)
-noinst_LIBRARIES = libtrau.a
+AM_CFLAGS = \
+ -Wall \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOVTY_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(LIBOSMONETIF_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(NULL)
-libtrau_a_SOURCES = rtp_proxy.c trau_mux.c trau_upqueue.c
+AM_LDFLAGS = \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMOABIS_LIBS) \
+ $(COVERAGE_LDFLAGS) \
+ $(NULL)
+
+noinst_LIBRARIES = \
+ libtrau.a \
+ $(NULL)
+
+libtrau_a_SOURCES = \
+ rtp_proxy.c \
+ trau_mux.c \
+ trau_upqueue.c \
+ $(NULL)
diff --git a/openbsc/src/osmo-bsc/Makefile.am b/openbsc/src/osmo-bsc/Makefile.am
index 4aa1803..328fd50 100644
--- a/openbsc/src/osmo-bsc/Makefile.am
+++ b/openbsc/src/osmo-bsc/Makefile.am
@@ -1,13 +1,43 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMONETIF_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(COVERAGE_CFLAGS) $(LIBOSMOABIS_CFLAGS)
-AM_LDFLAGS = $(COVERAGE_LDFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir) \
+ $(NULL)
-bin_PROGRAMS = osmo-bsc
+AM_CFLAGS = \
+ -Wall \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOVTY_CFLAGS) \
+ $(LIBOSMOCTRL_CFLAGS) \
+ $(LIBOSMONETIF_CFLAGS) \
+ $(LIBOSMOSCCP_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(NULL)
+
+AM_LDFLAGS = \
+ $(COVERAGE_LDFLAGS) \
+ $(NULL)
+
+bin_PROGRAMS = \
+ osmo-bsc \
+ $(NULL)
-osmo_bsc_SOURCES = osmo_bsc_main.c osmo_bsc_vty.c osmo_bsc_api.c \
- osmo_bsc_grace.c osmo_bsc_msc.c osmo_bsc_sccp.c \
- osmo_bsc_filter.c osmo_bsc_bssap.c osmo_bsc_audio.c osmo_bsc_ctrl.c
+osmo_bsc_SOURCES = \
+ osmo_bsc_main.c \
+ osmo_bsc_vty.c \
+ osmo_bsc_api.c \
+ osmo_bsc_grace.c \
+ osmo_bsc_msc.c \
+ osmo_bsc_sccp.c \
+ osmo_bsc_filter.c \
+ osmo_bsc_bssap.c \
+ osmo_bsc_audio.c \
+ osmo_bsc_ctrl.c \
+ $(NULL)
+
# once again since TRAU uses CC symbol :(
osmo_bsc_LDADD = \
$(top_builddir)/src/libfilter/libfilter.a \
@@ -16,6 +46,11 @@
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOSCCP_LIBS) $(LIBOSMOCORE_LIBS) \
- $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOCTRL_LIBS) \
- $(COVERAGE_LDFLAGS) $(LIBOSMOABIS_LIBS)
+ $(LIBOSMOSCCP_LIBS) \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMOVTY_LIBS) \
+ $(LIBOSMOCTRL_LIBS) \
+ $(COVERAGE_LDFLAGS) \
+ $(LIBOSMOABIS_LIBS) \
+ $(NULL)
diff --git a/openbsc/src/osmo-bsc_mgcp/Makefile.am b/openbsc/src/osmo-bsc_mgcp/Makefile.am
index a48f24b..9b2f191 100644
--- a/openbsc/src/osmo-bsc_mgcp/Makefile.am
+++ b/openbsc/src/osmo-bsc_mgcp/Makefile.am
@@ -1,14 +1,34 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) \
- $(LIBOSMOVTY_CFLAGS) $(LIBOSMOABIS_CFLAGS) \
- $(LIBOSMONETIF_CFLAGS) $(COVERAGE_CFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir) \
+ $(NULL)
-bin_PROGRAMS = osmo-bsc_mgcp
+AM_CFLAGS = \
+ -Wall \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOVTY_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(LIBOSMONETIF_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(NULL)
-osmo_bsc_mgcp_SOURCES = mgcp_main.c
+bin_PROGRAMS = \
+ osmo-bsc_mgcp \
+ $(NULL)
+
+osmo_bsc_mgcp_SOURCES = \
+ mgcp_main.c \
+ $(NULL)
osmo_bsc_mgcp_LDADD = $(top_builddir)/src/libcommon/libcommon.a \
- $(top_builddir)/src/libmgcp/libmgcp.a -lrt \
- $(LIBOSMOVTY_LIBS) $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \
- $(LIBOSMONETIF_LIBS) $(LIBBCG729_LIBS) \
- $(LIBRARY_GSM)
+ $(top_builddir)/src/libmgcp/libmgcp.a \
+ $(LIBOSMOVTY_LIBS) \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMONETIF_LIBS) \
+ $(LIBBCG729_LIBS) \
+ $(LIBRARY_GSM) \
+ -lrt \
+ $(NULL)
diff --git a/openbsc/src/osmo-bsc_nat/Makefile.am b/openbsc/src/osmo-bsc_nat/Makefile.am
index 4a6f74d..6c07d7f 100644
--- a/openbsc/src/osmo-bsc_nat/Makefile.am
+++ b/openbsc/src/osmo-bsc_nat/Makefile.am
@@ -1,19 +1,58 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMONETIF_CFLAGS) $(LIBCRYPTO_CFLAGS) $(COVERAGE_CFLAGS)
-AM_LDFLAGS = $(COVERAGE_LDFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir) \
+ $(NULL)
-bin_PROGRAMS = osmo-bsc_nat
+AM_CFLAGS = \
+ -Wall \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOVTY_CFLAGS) \
+ $(LIBOSMOCTRL_CFLAGS) \
+ $(LIBOSMOSCCP_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(LIBOSMONETIF_CFLAGS) \
+ $(LIBCRYPTO_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(NULL)
+
+AM_LDFLAGS = \
+ $(COVERAGE_LDFLAGS) \
+ $(NULL)
+
+bin_PROGRAMS = \
+ osmo-bsc_nat \
+ $(NULL)
-osmo_bsc_nat_SOURCES = bsc_filter.c bsc_mgcp_utils.c bsc_nat.c bsc_nat_utils.c \
- bsc_nat_vty.c bsc_sccp.c bsc_ussd.c bsc_nat_ctrl.c \
- bsc_nat_rewrite.c bsc_nat_rewrite_trie.c bsc_nat_filter.c
+osmo_bsc_nat_SOURCES = \
+ bsc_filter.c \
+ bsc_mgcp_utils.c \
+ bsc_nat.c \
+ bsc_nat_utils.c \
+ bsc_nat_vty.c \
+ bsc_sccp.c \
+ bsc_ussd.c \
+ bsc_nat_ctrl.c \
+ bsc_nat_rewrite.c \
+ bsc_nat_rewrite_trie.c \
+ bsc_nat_filter.c \
+ $(NULL)
+
osmo_bsc_nat_LDADD = \
- $(top_builddir)/src/libmgcp/libmgcp.a \
- $(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libtrau/libtrau.a \
- $(top_builddir)/src/libcommon/libcommon.a \
- $(top_builddir)/src/libfilter/libfilter.a \
- -lrt $(LIBOSMOSCCP_LIBS) $(LIBOSMOCORE_LIBS) \
- $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOCTRL_LIBS) \
- $(LIBOSMOABIS_LIBS) $(LIBOSMONETIF_LIBS) $(LIBCRYPTO_LIBS)
+ $(top_builddir)/src/libmgcp/libmgcp.a \
+ $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libtrau/libtrau.a \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(top_builddir)/src/libfilter/libfilter.a \
+ $(LIBOSMOSCCP_LIBS) \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMOVTY_LIBS) \
+ $(LIBOSMOCTRL_LIBS) \
+ $(LIBOSMOABIS_LIBS) \
+ $(LIBOSMONETIF_LIBS) \
+ $(LIBCRYPTO_LIBS) \
+ -lrt \
+ $(NULL)
diff --git a/openbsc/src/osmo-nitb/Makefile.am b/openbsc/src/osmo-nitb/Makefile.am
index 3b7cc8d..7e2782e 100644
--- a/openbsc/src/osmo-nitb/Makefile.am
+++ b/openbsc/src/osmo-nitb/Makefile.am
@@ -1,18 +1,44 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS=-Wall $(COVERAGE_CFLAGS) \
- $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) \
- $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBSMPP34_CFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir) \
+ $(NULL)
-AM_LDFLAGS = $(COVERAGE_LDFLAGS)
+AM_CFLAGS = \
+ -Wall \
+ $(COVERAGE_CFLAGS) \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOVTY_CFLAGS) \
+ $(LIBOSMOCTRL_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(LIBSMPP34_CFLAGS) \
+ $(NULL)
-bin_PROGRAMS = osmo-nitb
+AM_LDFLAGS = \
+ $(COVERAGE_LDFLAGS) \
+ $(NULL)
-osmo_nitb_SOURCES = bsc_hack.c
+bin_PROGRAMS = \
+ osmo-nitb \
+ $(NULL)
+
+osmo_nitb_SOURCES = \
+ bsc_hack.c \
+ $(NULL)
+
osmo_nitb_LDADD = \
- $(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libmsc/libmsc.a \
- $(top_builddir)/src/libtrau/libtrau.a \
- $(top_builddir)/src/libcommon/libcommon.a \
- -ldbi $(LIBCRYPT) \
- $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOCORE_LIBS) \
- $(LIBOSMOCTRL_LIBS) $(LIBOSMOABIS_LIBS) $(LIBSMPP34_LIBS) $(LIBCRYPTO_LIBS)
+ $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libmsc/libmsc.a \
+ $(top_builddir)/src/libtrau/libtrau.a \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(LIBCRYPT) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMOVTY_LIBS) \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOCTRL_LIBS) \
+ $(LIBOSMOABIS_LIBS) \
+ $(LIBSMPP34_LIBS) \
+ $(LIBCRYPTO_LIBS) \
+ -ldbi \
+ $(NULL)
diff --git a/openbsc/src/utils/Makefile.am b/openbsc/src/utils/Makefile.am
index 5a2e2d2..e54a93d 100644
--- a/openbsc/src/utils/Makefile.am
+++ b/openbsc/src/utils/Makefile.am
@@ -1,42 +1,124 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(SQLITE3_CFLAGS) \
- $(LIBSMPP34_CFLAGS)
-AM_LDFLAGS = $(COVERAGE_LDFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir) \
+ $(NULL)
-noinst_HEADERS = meas_db.h
+AM_CFLAGS = \
+ -Wall \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOVTY_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(SQLITE3_CFLAGS) \
+ $(LIBSMPP34_CFLAGS) \
+ $(NULL)
-bin_PROGRAMS = bs11_config isdnsync
+AM_LDFLAGS = \
+ $(COVERAGE_LDFLAGS) \
+ $(NULL)
+
+noinst_HEADERS = \
+ meas_db.h \
+ $(NULL)
+
+bin_PROGRAMS = \
+ bs11_config \
+ isdnsync \
+ $(NULL)
+
if HAVE_SQLITE3
-bin_PROGRAMS += osmo-meas-pcap2db osmo-meas-udp2db
+bin_PROGRAMS += \
+ osmo-meas-pcap2db \
+ osmo-meas-udp2db \
+ $(NULL)
endif
if HAVE_LIBCDK
-bin_PROGRAMS += meas_vis
+bin_PROGRAMS += \
+ meas_vis \
+ $(NULL)
endif
if BUILD_SMPP
-noinst_PROGRAMS = smpp_mirror
+noinst_PROGRAMS = \
+ smpp_mirror \
+ $(NULL)
endif
-bs11_config_SOURCES = bs11_config.c
-bs11_config_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
+bs11_config_SOURCES = \
+ bs11_config.c \
+ $(NULL)
+
+bs11_config_LDADD = \
+ $(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOABIS_LIBS)
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMOABIS_LIBS) \
+ $(NULL)
-isdnsync_SOURCES = isdnsync.c
+isdnsync_SOURCES = \
+ isdnsync.c \
+ $(NULL)
-smpp_mirror_SOURCES = smpp_mirror.c
-smpp_mirror_LDADD = $(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBSMPP34_LIBS)
+smpp_mirror_SOURCES = \
+ smpp_mirror.c \
+ $(NULL)
-meas_vis_SOURCES = meas_vis.c
-meas_vis_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -lcdk -lncurses
-meas_vis_CFLAGS = $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
+smpp_mirror_LDADD = \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBSMPP34_LIBS) \
+ $(NULL)
-osmo_meas_pcap2db_SOURCES = meas_pcap2db.c meas_db.c
-osmo_meas_pcap2db_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -lpcap $(SQLITE3_LIBS)
-osmo_meas_pcap2db_CFLAGS = $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
+meas_vis_SOURCES = \
+ meas_vis.c \
+ $(NULL)
-osmo_meas_udp2db_SOURCES = meas_udp2db.c meas_db.c
-osmo_meas_udp2db_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(SQLITE3_LIBS)
-osmo_meas_udp2db_CFLAGS = $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
+meas_vis_LDADD = \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ -lcdk \
+ -lncurses \
+ $(NULL)
+
+meas_vis_CFLAGS = \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(NULL)
+
+osmo_meas_pcap2db_SOURCES = \
+ meas_pcap2db.c \
+ meas_db.c \
+ $(NULL)
+
+osmo_meas_pcap2db_LDADD = \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(SQLITE3_LIBS) \
+ -lpcap \
+ $(NULL)
+
+osmo_meas_pcap2db_CFLAGS = \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(NULL)
+
+osmo_meas_udp2db_SOURCES = \
+ meas_udp2db.c \
+ meas_db.c \
+ $(NULL)
+
+osmo_meas_udp2db_LDADD = \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(SQLITE3_LIBS) \
+ $(NULL)
+
+osmo_meas_udp2db_CFLAGS = \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(NULL)
diff --git a/openbsc/tests/Makefile.am b/openbsc/tests/Makefile.am
index ba5ca28..5c9a302 100644
--- a/openbsc/tests/Makefile.am
+++ b/openbsc/tests/Makefile.am
@@ -1,21 +1,46 @@
-SUBDIRS = gsm0408 db channel mgcp gprs abis gbproxy trau subscr mm_auth xid
+SUBDIRS = \
+ gsm0408 \
+ db \
+ channel \
+ mgcp \
+ gprs \
+ abis \
+ gbproxy \
+ trau \
+ subscr \
+ mm_auth \
+ xid \
+ $(NULL)
if BUILD_NAT
-SUBDIRS += bsc-nat bsc-nat-trie
+SUBDIRS += \
+ bsc-nat \
+ bsc-nat-trie \
+ $(NULL)
endif
if BUILD_BSC
-SUBDIRS += bsc
+SUBDIRS += \
+ bsc \
+ $(NULL)
endif
if BUILD_SMPP
-SUBDIRS += smpp
+SUBDIRS += \
+ smpp \
+ $(NULL)
endif
if HAVE_LIBGTP
-SUBDIRS += gtphub
+SUBDIRS += \
+ gtphub \
+ $(NULL)
+
if HAVE_LIBCARES
-SUBDIRS += sgsn oap
+SUBDIRS += \
+ sgsn \
+ oap \
+ $(NULL)
endif
endif
@@ -38,9 +63,22 @@
echo ' [$(PACKAGE_URL)])'; \
} >'$(srcdir)/package.m4'
-EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE) vty_test_runner.py ctrl_test_runner.py smpp_test_runner.py
-TESTSUITE = $(srcdir)/testsuite
-DISTCLEANFILES = atconfig
+EXTRA_DIST = \
+ testsuite.at \
+ $(srcdir)/package.m4 \
+ $(TESTSUITE) \
+ vty_test_runner.py \
+ ctrl_test_runner.py \
+ smpp_test_runner.py \
+ $(NULL)
+
+TESTSUITE = \
+ $(srcdir)/testsuite \
+ $(NULL)
+
+DISTCLEANFILES = \
+ atconfig \
+ $(NULL)
if ENABLE_EXT_TESTS
python-tests: $(BUILT_SOURCES)
diff --git a/openbsc/tests/abis/Makefile.am b/openbsc/tests/abis/Makefile.am
index c2e38de..d3f40f2 100644
--- a/openbsc/tests/abis/Makefile.am
+++ b/openbsc/tests/abis/Makefile.am
@@ -1,17 +1,35 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOABIS_CFLAGS) \
- $(LIBOSMOGSM_CFLAGS) $(COVERAGE_CFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ $(NULL)
-EXTRA_DIST = abis_test.ok
+AM_CFLAGS = \
+ -Wall \
+ -ggdb3 \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(NULL)
-noinst_PROGRAMS = abis_test
+EXTRA_DIST = \
+ abis_test.ok \
+ $(NULL)
-abis_test_SOURCES = abis_test.c
+noinst_PROGRAMS = \
+ abis_test \
+ $(NULL)
+
+abis_test_SOURCES = \
+ abis_test.c \
+ $(NULL)
abis_test_LDADD = \
- $(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libcommon/libcommon.a \
- $(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libtrau/libtrau.a \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOABIS_LIBS) \
- $(LIBOSMOGSM_LIBS)
+ $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libtrau/libtrau.a \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOABIS_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(NULL)
diff --git a/openbsc/tests/bsc-nat/Makefile.am b/openbsc/tests/bsc-nat/Makefile.am
index 26e5500..4c1dac8 100644
--- a/openbsc/tests/bsc-nat/Makefile.am
+++ b/openbsc/tests/bsc-nat/Makefile.am
@@ -1,26 +1,58 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOSCCP_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMONETIF_CFLAGS) $(COVERAGE_CFLAGS)
-AM_LDFLAGS = $(COVERAGE_LDFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ $(NULL)
-EXTRA_DIST = bsc_nat_test.ok bsc_data.c barr.cfg barr_dup.cfg prefixes.csv
+AM_CFLAGS = \
+ -Wall \
+ -ggdb3 \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOCTRL_LIBS) \
+ $(LIBOSMOSCCP_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(LIBOSMONETIF_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(NULL)
-noinst_PROGRAMS = bsc_nat_test
+AM_LDFLAGS = \
+ $(COVERAGE_LDFLAGS) \
+ $(NULL)
-bsc_nat_test_SOURCES = bsc_nat_test.c \
- $(top_srcdir)/src/osmo-bsc_nat/bsc_filter.c \
- $(top_srcdir)/src/osmo-bsc_nat/bsc_sccp.c \
- $(top_srcdir)/src/osmo-bsc_nat/bsc_nat_utils.c \
- $(top_srcdir)/src/osmo-bsc_nat/bsc_nat_rewrite.c \
- $(top_srcdir)/src/osmo-bsc_nat/bsc_nat_rewrite_trie.c \
- $(top_srcdir)/src/osmo-bsc_nat/bsc_mgcp_utils.c \
- $(top_srcdir)/src/osmo-bsc_nat/bsc_nat_filter.c
+EXTRA_DIST = \
+ bsc_nat_test.ok \
+ bsc_data.c \
+ barr.cfg \
+ barr_dup.cfg \
+ prefixes.csv \
+ $(NULL)
+
+noinst_PROGRAMS = \
+ bsc_nat_test \
+ $(NULL)
+
+bsc_nat_test_SOURCES = \
+ bsc_nat_test.c \
+ $(top_srcdir)/src/osmo-bsc_nat/bsc_filter.c \
+ $(top_srcdir)/src/osmo-bsc_nat/bsc_sccp.c \
+ $(top_srcdir)/src/osmo-bsc_nat/bsc_nat_utils.c \
+ $(top_srcdir)/src/osmo-bsc_nat/bsc_nat_rewrite.c \
+ $(top_srcdir)/src/osmo-bsc_nat/bsc_nat_rewrite_trie.c \
+ $(top_srcdir)/src/osmo-bsc_nat/bsc_mgcp_utils.c \
+ $(top_srcdir)/src/osmo-bsc_nat/bsc_nat_filter.c
+
bsc_nat_test_LDADD = \
- $(top_builddir)/src/libfilter/libfilter.a \
- $(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libmgcp/libmgcp.a \
- $(top_builddir)/src/libtrau/libtrau.a \
- $(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -lrt \
- $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) \
- $(LIBOSMOABIS_LIBS) $(LIBOSMONETIF_LIBS) \
- $(LIBOSMOCTRL_LIBS)
+ $(top_builddir)/src/libfilter/libfilter.a \
+ $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libmgcp/libmgcp.a \
+ $(top_builddir)/src/libtrau/libtrau.a \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMOSCCP_LIBS) \
+ $(LIBOSMOVTY_LIBS) \
+ $(LIBOSMOABIS_LIBS) \
+ $(LIBOSMONETIF_LIBS) \
+ $(LIBOSMOCTRL_LIBS) \
+ -lrt \
+ $(NULL)
diff --git a/openbsc/tests/bsc/Makefile.am b/openbsc/tests/bsc/Makefile.am
index 8b786ff..63e13da 100644
--- a/openbsc/tests/bsc/Makefile.am
+++ b/openbsc/tests/bsc/Makefile.am
@@ -1,18 +1,45 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS)
-AM_LDFLAGS = $(COVERAGE_LDFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ $(NULL)
-EXTRA_DIST = bsc_test.ok
+AM_CFLAGS = \
+ -Wall \
+ -ggdb3 \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOSCCP_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(NULL)
-noinst_PROGRAMS = bsc_test
+AM_LDFLAGS = \
+ $(COVERAGE_LDFLAGS) \
+ $(NULL)
-bsc_test_SOURCES = bsc_test.c \
- $(top_srcdir)/src/osmo-bsc/osmo_bsc_filter.c
-bsc_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libmsc/libmsc.a \
- $(top_builddir)/src/libmgcp/libmgcp.a \
- $(top_builddir)/src/libtrau/libtrau.a \
- $(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -lrt \
- $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) \
- $(LIBOSMOABIS_LIBS)
+EXTRA_DIST = \
+ bsc_test.ok \
+ $(NULL)
+
+noinst_PROGRAMS = \
+ bsc_test \
+ $(NULL)
+
+bsc_test_SOURCES = \
+ bsc_test.c \
+ $(top_srcdir)/src/osmo-bsc/osmo_bsc_filter.c \
+ $(NULL)
+
+bsc_test_LDADD = \
+ $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libmsc/libmsc.a \
+ $(top_builddir)/src/libmgcp/libmgcp.a \
+ $(top_builddir)/src/libtrau/libtrau.a \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMOSCCP_LIBS) \
+ $(LIBOSMOVTY_LIBS) \
+ $(LIBOSMOABIS_LIBS) \
+ -lrt \
+ $(NULL)
diff --git a/openbsc/tests/channel/Makefile.am b/openbsc/tests/channel/Makefile.am
index 51b2f83..86cb2cd 100644
--- a/openbsc/tests/channel/Makefile.am
+++ b/openbsc/tests/channel/Makefile.am
@@ -1,14 +1,33 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ $(NULL)
-EXTRA_DIST = channel_test.ok
+AM_CFLAGS = \
+ -Wall \
+ -ggdb3 \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(NULL)
-noinst_PROGRAMS = channel_test
+EXTRA_DIST = \
+ channel_test.ok \
+ $(NULL)
-channel_test_SOURCES = channel_test.c
+noinst_PROGRAMS = \
+ channel_test \
+ $(NULL)
+
+channel_test_SOURCES = \
+ channel_test.c \
+ $(NULL)
channel_test_LDADD = \
- $(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libmsc/libmsc.a \
- $(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOCORE_LIBS) \
- -ldbi $(LIBOSMOGSM_LIBS) $(LIBCRYPTO_LIBS)
+ $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libmsc/libmsc.a \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBCRYPTO_LIBS) \
+ -ldbi \
+ $(NULL)
diff --git a/openbsc/tests/db/Makefile.am b/openbsc/tests/db/Makefile.am
index be3af5f..14ee3aa 100644
--- a/openbsc/tests/db/Makefile.am
+++ b/openbsc/tests/db/Makefile.am
@@ -1,17 +1,48 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBSMPP34_CFLAGS) $(COVERAGE_CFLAGS)
-AM_LDFLAGS = $(COVERAGE_LDFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ $(NULL)
-EXTRA_DIST = db_test.ok db_test.err hlr.sqlite3
+AM_CFLAGS = \
+ -Wall \
+ -ggdb3 \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(LIBSMPP34_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(NULL)
-noinst_PROGRAMS = db_test
+AM_LDFLAGS = \
+ $(COVERAGE_LDFLAGS) \
+ $(NULL)
-db_test_SOURCES = db_test.c
-db_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
+EXTRA_DIST = \
+ db_test.ok \
+ db_test.err \
+ hlr.sqlite3 \
+ $(NULL)
+
+noinst_PROGRAMS = \
+ db_test \
+ $(NULL)
+
+db_test_SOURCES = \
+ db_test.c \
+ $(NULL)
+
+db_test_LDADD = \
+ $(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libmsc/libmsc.a \
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOABIS_LIBS) \
- $(LIBOSMOGSM_LIBS) $(LIBSMPP34_LIBS) $(LIBOSMOVTY_LIBS) $(LIBCRYPTO_LIBS) -ldbi
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOABIS_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBSMPP34_LIBS) \
+ $(LIBOSMOVTY_LIBS) \
+ $(LIBCRYPTO_LIBS) \
+ -ldbi \
+ $(NULL)
diff --git a/openbsc/tests/gbproxy/Makefile.am b/openbsc/tests/gbproxy/Makefile.am
index 18d77a8..1308bda 100644
--- a/openbsc/tests/gbproxy/Makefile.am
+++ b/openbsc/tests/gbproxy/Makefile.am
@@ -1,27 +1,54 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS)
-AM_LDFLAGS = $(COVERAGE_LDFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ $(NULL)
-EXTRA_DIST = gbproxy_test.ok
+AM_CFLAGS = \
+ -Wall \
+ -ggdb3 \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(NULL)
-noinst_PROGRAMS = gbproxy_test
+AM_LDFLAGS = \
+ $(COVERAGE_LDFLAGS) \
+ $(NULL)
-gbproxy_test_SOURCES = gbproxy_test.c
+EXTRA_DIST = \
+ gbproxy_test.ok \
+ $(NULL)
+
+noinst_PROGRAMS = \
+ gbproxy_test \
+ $(NULL)
+
+gbproxy_test_SOURCES = \
+ gbproxy_test.c \
+ $(NULL)
+
gbproxy_test_LDFLAGS = \
- -Wl,--wrap=RAND_bytes
+ -Wl,--wrap=RAND_bytes \
+ $(NULL)
+
gbproxy_test_LDADD = \
- $(top_builddir)/src/gprs/gb_proxy.o \
- $(top_builddir)/src/gprs/gb_proxy_patch.o \
- $(top_builddir)/src/gprs/gb_proxy_peer.o \
- $(top_builddir)/src/gprs/gb_proxy_tlli.o \
- $(top_builddir)/src/gprs/gprs_gb_parse.o \
- $(top_builddir)/src/gprs/gprs_llc_parse.o \
- $(top_builddir)/src/gprs/crc24.o \
- $(top_builddir)/src/gprs/gprs_utils.o \
- $(top_builddir)/src/libcommon/libcommon.a \
- $(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libtrau/libtrau.a \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGB_LIBS) \
- $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \
- $(LIBOSMOABIS_LIBS) $(LIBRARY_DL) \
- $(LIBCRYPTO_LIBS) -lrt
+ $(top_builddir)/src/gprs/gb_proxy.o \
+ $(top_builddir)/src/gprs/gb_proxy_patch.o \
+ $(top_builddir)/src/gprs/gb_proxy_peer.o \
+ $(top_builddir)/src/gprs/gb_proxy_tlli.o \
+ $(top_builddir)/src/gprs/gprs_gb_parse.o \
+ $(top_builddir)/src/gprs/gprs_llc_parse.o \
+ $(top_builddir)/src/gprs/crc24.o \
+ $(top_builddir)/src/gprs/gprs_utils.o \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libtrau/libtrau.a \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGB_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMOVTY_LIBS) \
+ $(LIBOSMOABIS_LIBS) \
+ $(LIBRARY_DL) \
+ $(LIBCRYPTO_LIBS) \
+ -lrt \
+ $(NULL)
diff --git a/openbsc/tests/gsm0408/Makefile.am b/openbsc/tests/gsm0408/Makefile.am
index 79fb9f1..f736557 100644
--- a/openbsc/tests/gsm0408/Makefile.am
+++ b/openbsc/tests/gsm0408/Makefile.am
@@ -1,12 +1,34 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS)
-noinst_PROGRAMS = gsm0408_test
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ $(NULL)
-EXTRA_DIST = gsm0408_test.ok
+AM_CFLAGS = \
+ -Wall \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(NULL)
-gsm0408_test_SOURCES = gsm0408_test.c
-gsm0408_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libmsc/libmsc.a \
- $(top_builddir)/src/libtrau/libtrau.a \
- $(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOABIS_LIBS) -ldbi
+noinst_PROGRAMS = \
+ gsm0408_test \
+ $(NULL)
+
+EXTRA_DIST = \
+ gsm0408_test.ok \
+ $(NULL)
+
+gsm0408_test_SOURCES = \
+ gsm0408_test.c \
+ $(NULL)
+
+gsm0408_test_LDADD = \
+ $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libmsc/libmsc.a \
+ $(top_builddir)/src/libtrau/libtrau.a \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMOABIS_LIBS) \
+ -ldbi \
+ $(NULL)
diff --git a/openbsc/tests/gtphub/Makefile.am b/openbsc/tests/gtphub/Makefile.am
index dcb7211..654b662 100644
--- a/openbsc/tests/gtphub/Makefile.am
+++ b/openbsc/tests/gtphub/Makefile.am
@@ -1,24 +1,40 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ $(NULL)
+
+AM_CFLAGS = \
+ -Wall \
+ -ggdb3 \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(NULL)
EXTRA_DIST = \
- gtphub_test.ok
+ gtphub_test.ok \
+ $(NULL)
if HAVE_LIBGTP
if HAVE_LIBCARES
-noinst_PROGRAMS = gtphub_test
+noinst_PROGRAMS = \
+ gtphub_test \
+ $(NULL)
endif
endif
-gtphub_test_SOURCES = gtphub_test.c
+gtphub_test_SOURCES = \
+ gtphub_test.c \
+ $(NULL)
+
gtphub_test_LDFLAGS = \
- -Wl,--wrap=gtphub_resolve_ggsn_addr \
- -Wl,--wrap=gtphub_ares_init \
- -Wl,--wrap=gtphub_write
+ -Wl,--wrap=gtphub_resolve_ggsn_addr \
+ -Wl,--wrap=gtphub_ares_init \
+ -Wl,--wrap=gtphub_write \
+ $(NULL)
gtphub_test_LDADD = \
- $(top_builddir)/src/gprs/gtphub.o \
- $(top_builddir)/src/gprs/gprs_utils.o \
- $(LIBOSMOCORE_LIBS) \
- -lgtp -lrt
-
+ $(top_builddir)/src/gprs/gtphub.o \
+ $(top_builddir)/src/gprs/gprs_utils.o \
+ $(LIBOSMOCORE_LIBS) \
+ -lgtp \
+ -lrt \
+ $(NULL)
diff --git a/openbsc/tests/mgcp/Makefile.am b/openbsc/tests/mgcp/Makefile.am
index 82d6ac6..77cb6b7 100644
--- a/openbsc/tests/mgcp/Makefile.am
+++ b/openbsc/tests/mgcp/Makefile.am
@@ -1,30 +1,73 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_srcdir)
-AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_FLAGS) $(LIBOSMONETIF_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(COVERAGE_CFLAGS) $(LIBBCG729_CFLAGS)
-AM_LDFLAGS = $(COVERAGE_LDFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir) \
+ $(NULL)
-EXTRA_DIST = mgcp_test.ok mgcp_transcoding_test.ok
+AM_CFLAGS = \
+ -Wall \
+ -ggdb3 \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_FLAGS) \
+ $(LIBOSMONETIF_CFLAGS) \
+ $(LIBOSMOSCCP_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(LIBBCG729_CFLAGS) \
+ $(NULL)
-noinst_PROGRAMS = mgcp_test
+AM_LDFLAGS = \
+ $(COVERAGE_LDFLAGS) \
+ $(NULL)
+
+EXTRA_DIST = \
+ mgcp_test.ok \
+ mgcp_transcoding_test.ok \
+ $(NULL)
+
+noinst_PROGRAMS = \
+ mgcp_test \
+ $(NULL)
if BUILD_MGCP_TRANSCODING
-noinst_PROGRAMS += mgcp_transcoding_test
+noinst_PROGRAMS += \
+ mgcp_transcoding_test \
+ $(NULL)
endif
-mgcp_test_SOURCES = mgcp_test.c
+mgcp_test_SOURCES = \
+ mgcp_test.c \
+ $(NULL)
-mgcp_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libmgcp/libmgcp.a \
- $(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \
- -lrt -lm $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) \
- $(LIBRARY_DL) $(LIBOSMONETIF_LIBS)
+mgcp_test_LDADD = \
+ $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libmgcp/libmgcp.a \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMOSCCP_LIBS) \
+ $(LIBOSMOVTY_LIBS) \
+ $(LIBRARY_DL) \
+ $(LIBOSMONETIF_LIBS) \
+ -lrt \
+ -lm \
+ $(NULL)
-mgcp_transcoding_test_SOURCES = mgcp_transcoding_test.c
+mgcp_transcoding_test_SOURCES = \
+ mgcp_transcoding_test.c \
+ $(NULL)
mgcp_transcoding_test_LDADD = \
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libmgcp/libmgcp.a \
$(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \
- $(LIBBCG729_LIBS) -lrt -lm $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) \
- $(LIBRARY_DL) $(LIBOSMONETIF_LIBS) $(LIBRARY_GSM)
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBBCG729_LIBS) \
+ $(LIBOSMOSCCP_LIBS) \
+ $(LIBOSMOVTY_LIBS) \
+ $(LIBRARY_DL) \
+ $(LIBOSMONETIF_LIBS) \
+ $(LIBRARY_GSM) \
+ -lrt \
+ -lm \
+ $(NULL)
diff --git a/openbsc/tests/mm_auth/Makefile.am b/openbsc/tests/mm_auth/Makefile.am
index 516df00..9db9716 100644
--- a/openbsc/tests/mm_auth/Makefile.am
+++ b/openbsc/tests/mm_auth/Makefile.am
@@ -1,21 +1,36 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-Wall \
- $(LIBOSMOCORE_CFLAGS) \
- $(LIBOSMOGSM_CFLAGS) \
- $(LIBCRYPTO_CFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ $(NULL)
-noinst_PROGRAMS = mm_auth_test
+AM_CFLAGS = \
+ -Wall \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBCRYPTO_CFLAGS) \
+ $(NULL)
-EXTRA_DIST = mm_auth_test.ok
+noinst_PROGRAMS = \
+ mm_auth_test \
+ $(NULL)
-mm_auth_test_SOURCES = mm_auth_test.c
+EXTRA_DIST = \
+ mm_auth_test.ok \
+ $(NULL)
+
+mm_auth_test_SOURCES = \
+ mm_auth_test.c \
+ $(NULL)
mm_auth_test_LDFLAGS = \
- -Wl,--wrap=db_get_authinfo_for_subscr \
- -Wl,--wrap=db_get_lastauthtuple_for_subscr \
- -Wl,--wrap=db_sync_lastauthtuple_for_subscr
+ -Wl,--wrap=db_get_authinfo_for_subscr \
+ -Wl,--wrap=db_get_lastauthtuple_for_subscr \
+ -Wl,--wrap=db_sync_lastauthtuple_for_subscr \
+ $(NULL)
-mm_auth_test_LDADD = $(top_builddir)/src/libmsc/libmsc.a \
+mm_auth_test_LDADD = \
+ $(top_builddir)/src/libmsc/libmsc.a \
$(top_builddir)/src/libcommon/libcommon.a \
$(LIBOSMOCORE_LIBS) \
- $(LIBOSMOGSM_LIBS)
+ $(LIBOSMOGSM_LIBS) \
+ $(NULL)
diff --git a/openbsc/tests/oap/Makefile.am b/openbsc/tests/oap/Makefile.am
index 538e178..f1a7ccf 100644
--- a/openbsc/tests/oap/Makefile.am
+++ b/openbsc/tests/oap/Makefile.am
@@ -1,22 +1,37 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ $(NULL)
-EXTRA_DIST = oap_test.ok
+AM_CFLAGS = \
+ -Wall \
+ -ggdb3 \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(NULL)
+
+EXTRA_DIST = \
+ oap_test.ok \
+ $(NULL)
if HAVE_LIBGTP
if HAVE_LIBCARES
-noinst_PROGRAMS = oap_test
+noinst_PROGRAMS = \
+ oap_test \
+ $(NULL)
endif
endif
-oap_test_SOURCES = oap_test.c
+oap_test_SOURCES = \
+ oap_test.c \
+ $(NULL)
oap_test_LDADD = \
- $(top_builddir)/src/gprs/oap.o \
- $(top_builddir)/src/gprs/oap_messages.o \
- $(top_builddir)/src/gprs/gprs_utils.o \
- $(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOCORE_LIBS) \
- $(LIBOSMOGSM_LIBS) \
- -lrt
+ $(top_builddir)/src/gprs/oap.o \
+ $(top_builddir)/src/gprs/oap_messages.o \
+ $(top_builddir)/src/gprs/gprs_utils.o \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ -lrt
diff --git a/openbsc/tests/sgsn/Makefile.am b/openbsc/tests/sgsn/Makefile.am
index ce64429..46c6089 100644
--- a/openbsc/tests/sgsn/Makefile.am
+++ b/openbsc/tests/sgsn/Makefile.am
@@ -1,52 +1,78 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBCARES_CFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ $(NULL)
+
+AM_CFLAGS = \
+ -Wall \
+ -ggdb3 \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBCARES_CFLAGS) \
+ $(NULL)
+
if BUILD_IU
-AM_CFLAGS += $(LIBASN1C_CFLAGS) $(LIBOSMOSIGTRAN_CFLAGS) $(LIBOSMORANAP_CFLAGS)
+AM_CFLAGS += \
+ $(LIBASN1C_CFLAGS) \
+ $(LIBOSMOSIGTRAN_CFLAGS) \
+ $(LIBOSMORANAP_CFLAGS) \
+ $(NULL)
endif
-EXTRA_DIST = sgsn_test.ok
+EXTRA_DIST = \
+ sgsn_test.ok \
+ $(NULL)
-noinst_PROGRAMS = sgsn_test
+noinst_PROGRAMS = \
+ sgsn_test \
+ $(NULL)
-sgsn_test_SOURCES = sgsn_test.c
+sgsn_test_SOURCES = \
+ sgsn_test.c \
+ $(NULL)
+
sgsn_test_LDFLAGS = \
- -Wl,--wrap=RAND_bytes \
- -Wl,--wrap=sgsn_update_subscriber_data \
- -Wl,--wrap=gprs_subscr_request_update_location \
- -Wl,--wrap=gprs_subscr_request_auth_info \
- -Wl,--wrap=gprs_gsup_client_send
+ -Wl,--wrap=RAND_bytes \
+ -Wl,--wrap=sgsn_update_subscriber_data \
+ -Wl,--wrap=gprs_subscr_request_update_location \
+ -Wl,--wrap=gprs_subscr_request_auth_info \
+ -Wl,--wrap=gprs_gsup_client_send \
+ $(NULL)
sgsn_test_LDADD = \
- $(top_builddir)/src/gprs/gprs_llc_parse.o \
- $(top_builddir)/src/gprs/gprs_llc.o \
- $(top_builddir)/src/gprs/crc24.o \
- $(top_builddir)/src/gprs/gprs_sndcp.o \
- $(top_builddir)/src/gprs/gprs_gmm.o \
- $(top_builddir)/src/gprs/gprs_sgsn.o \
- $(top_builddir)/src/gprs/sgsn_vty.o \
- $(top_builddir)/src/gprs/sgsn_libgtp.o \
- $(top_builddir)/src/gprs/sgsn_auth.o \
- $(top_builddir)/src/gprs/sgsn_ares.o \
- $(top_builddir)/src/gprs/gprs_gsup_client.o \
- $(top_builddir)/src/gprs/gprs_utils.o \
- $(top_builddir)/src/gprs/gprs_subscriber.o \
- $(top_builddir)/src/gprs/gprs_gb_parse.o \
- $(top_builddir)/src/gprs/oap.o \
- $(top_builddir)/src/gprs/oap_messages.o \
- $(top_builddir)/src/gprs/gprs_llc_xid.o \
- $(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOABIS_LIBS) \
- $(LIBOSMOCORE_LIBS) \
- $(LIBOSMOGSM_LIBS) \
- $(LIBOSMOGB_LIBS) \
- $(LIBCARES_LIBS) \
- $(LIBCRYPTO_LIBS) \
- -lgtp -lrt
+ $(top_builddir)/src/gprs/gprs_llc_parse.o \
+ $(top_builddir)/src/gprs/gprs_llc.o \
+ $(top_builddir)/src/gprs/crc24.o \
+ $(top_builddir)/src/gprs/gprs_sndcp.o \
+ $(top_builddir)/src/gprs/gprs_gmm.o \
+ $(top_builddir)/src/gprs/gprs_sgsn.o \
+ $(top_builddir)/src/gprs/sgsn_vty.o \
+ $(top_builddir)/src/gprs/sgsn_libgtp.o \
+ $(top_builddir)/src/gprs/sgsn_auth.o \
+ $(top_builddir)/src/gprs/sgsn_ares.o \
+ $(top_builddir)/src/gprs/gprs_gsup_client.o \
+ $(top_builddir)/src/gprs/gprs_utils.o \
+ $(top_builddir)/src/gprs/gprs_subscriber.o \
+ $(top_builddir)/src/gprs/gprs_gb_parse.o \
+ $(top_builddir)/src/gprs/oap.o \
+ $(top_builddir)/src/gprs/oap_messages.o \
+ $(top_builddir)/src/gprs/gprs_llc_xid.o \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(LIBOSMOABIS_LIBS) \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMOGB_LIBS) \
+ $(LIBCARES_LIBS) \
+ $(LIBCRYPTO_LIBS) \
+ -lgtp \
+ -lrt \
+ $(NULL)
+
if BUILD_IU
sgsn_test_LDADD += \
- $(top_builddir)/src/libiu/libiu.a \
- $(LIBOSMORANAP_LIBS) \
- $(LIBOSMOSIGTRAN_LIBS) \
- $(LIBASN1C_LIBS)
+ $(top_builddir)/src/libiu/libiu.a \
+ $(LIBOSMORANAP_LIBS) \
+ $(LIBOSMOSIGTRAN_LIBS) \
+ $(LIBASN1C_LIBS) \
+ $(NULL)
endif
-
diff --git a/openbsc/tests/smpp/Makefile.am b/openbsc/tests/smpp/Makefile.am
index aab4de9..fa09aa2 100644
--- a/openbsc/tests/smpp/Makefile.am
+++ b/openbsc/tests/smpp/Makefile.am
@@ -1,13 +1,40 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_srcdir)/src/libmsc
-AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSMPP34_CFLAGS)
-AM_LDFLAGS = $(COVERAGE_LDFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/src/libmsc \
+ $(NULL)
-EXTRA_DIST = smpp_test.ok smpp_test.err
+AM_CFLAGS = \
+ -Wall \
+ -ggdb3 \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOSCCP_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(LIBSMPP34_CFLAGS) \
+ $(NULL)
-noinst_PROGRAMS = smpp_test
+AM_LDFLAGS = \
+ $(COVERAGE_LDFLAGS) \
+ $(NULL)
-smpp_test_SOURCES = smpp_test.c \
- $(top_builddir)/src/libmsc/smpp_utils.c
+EXTRA_DIST = \
+ smpp_test.ok \
+ smpp_test.err \
+ $(NULL)
+
+noinst_PROGRAMS = \
+ smpp_test \
+ $(NULL)
+
+smpp_test_SOURCES = \
+ smpp_test.c \
+ $(top_builddir)/src/libmsc/smpp_utils.c \
+ $(NULL)
+
smpp_test_LDADD = \
- $(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(NULL)
diff --git a/openbsc/tests/subscr/Makefile.am b/openbsc/tests/subscr/Makefile.am
index 4f96dc9..a2c7e7e 100644
--- a/openbsc/tests/subscr/Makefile.am
+++ b/openbsc/tests/subscr/Makefile.am
@@ -1,18 +1,42 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBSMPP34_CFLAGS) $(COVERAGE_CFLAGS)
-AM_LDFLAGS = $(COVERAGE_LDFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ $(NULL)
-EXTRA_DIST = subscr_test.ok
+AM_CFLAGS = \
+ -Wall \
+ -ggdb3 \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(LIBSMPP34_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(NULL)
-noinst_PROGRAMS = subscr_test
+AM_LDFLAGS = \
+ $(COVERAGE_LDFLAGS) \
+ $(NULL)
-subscr_test_SOURCES = subscr_test.c
-subscr_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libmsc/libmsc.a \
- $(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libtrau/libtrau.a \
- $(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOABIS_LIBS) \
- $(LIBOSMOGSM_LIBS) $(LIBSMPP34_LIBS) $(LIBOSMOVTY_LIBS)
-# -ldbi
+EXTRA_DIST = \
+ subscr_test.ok \
+ $(NULL)
+noinst_PROGRAMS = \
+ subscr_test \
+ $(NULL)
+
+subscr_test_SOURCES = \
+ subscr_test.c \
+ $(NULL)
+
+subscr_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libmsc/libmsc.a \
+ $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libtrau/libtrau.a \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOABIS_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBSMPP34_LIBS) \
+ $(LIBOSMOVTY_LIBS) \
+ $(NULL)
diff --git a/openbsc/tests/trau/Makefile.am b/openbsc/tests/trau/Makefile.am
index cc1b4ef..9dfc10e 100644
--- a/openbsc/tests/trau/Makefile.am
+++ b/openbsc/tests/trau/Makefile.am
@@ -1,17 +1,46 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBSMPP34_CFLAGS) $(COVERAGE_CFLAGS)
-AM_LDFLAGS = $(COVERAGE_LDFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ $(NULL)
-EXTRA_DIST = trau_test.ok
+AM_CFLAGS = \
+ -Wall \
+ -ggdb3 \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOABIS_CFLAGS) \
+ $(LIBSMPP34_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(NULL)
-noinst_PROGRAMS = trau_test
+AM_LDFLAGS = \
+ $(COVERAGE_LDFLAGS) \
+ $(NULL)
-trau_test_SOURCES = trau_test.c
-trau_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libmsc/libmsc.a \
- $(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libtrau/libtrau.a \
- $(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOABIS_LIBS) \
- $(LIBOSMOGSM_LIBS) $(LIBSMPP34_LIBS) $(LIBOSMOVTY_LIBS) $(LIBRARY_DL) -ldbi
+EXTRA_DIST = \
+ trau_test.ok \
+ $(NULL)
+
+noinst_PROGRAMS = \
+ trau_test \
+ $(NULL)
+
+trau_test_SOURCES = \
+ trau_test.c \
+ $(NULL)
+
+trau_test_LDADD = \
+ $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libmsc/libmsc.a \
+ $(top_builddir)/src/libbsc/libbsc.a \
+ $(top_builddir)/src/libtrau/libtrau.a \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOABIS_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBSMPP34_LIBS) \
+ $(LIBOSMOVTY_LIBS) \
+ $(LIBRARY_DL) \
+ -ldbi \
+ $(NULL)
diff --git a/openbsc/tests/xid/Makefile.am b/openbsc/tests/xid/Makefile.am
index 9b64965..7e33ceb 100644
--- a/openbsc/tests/xid/Makefile.am
+++ b/openbsc/tests/xid/Makefile.am
@@ -1,21 +1,39 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBCARES_CFLAGS)
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ $(NULL)
-EXTRA_DIST = xid_test.ok
+AM_CFLAGS = \
+ -Wall \
+ -ggdb3 \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBCARES_CFLAGS) \
+ $(NULL)
-noinst_PROGRAMS = xid_test
+EXTRA_DIST = \
+ xid_test.ok \
+ $(NULL)
-xid_test_SOURCES = xid_test.c
+noinst_PROGRAMS = \
+ xid_test \
+ $(NULL)
+
+xid_test_SOURCES = \
+ xid_test.c \
+ $(NULL)
xid_test_LDADD = \
- $(top_builddir)/src/gprs/gprs_llc_xid.o \
- $(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOABIS_LIBS) \
- $(LIBOSMOCORE_LIBS) \
- $(LIBOSMOGSM_LIBS) \
- $(LIBOSMOGB_LIBS) \
- $(LIBCARES_LIBS) \
- $(LIBCRYPTO_LIBS) \
- -lgtp -lrt -lm
-
+ $(top_builddir)/src/gprs/gprs_llc_xid.o \
+ $(top_builddir)/src/libcommon/libcommon.a \
+ $(LIBOSMOABIS_LIBS) \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMOGB_LIBS) \
+ $(LIBCARES_LIBS) \
+ $(LIBCRYPTO_LIBS) \
+ -lgtp \
+ -lrt \
+ -lm \
+ $(NULL)
--
To view, visit https://gerrit.osmocom.org/838
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa21513c007072314097b7bec188579972dc1694
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: ahuemer <alexander.huemer at xx.vu>