diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2017-07-06 18:46:01 +0200 |
---|---|---|
committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2017-07-25 01:06:59 +0200 |
commit | eba5001a4cff2ef93b03ddc64bf29806c402cce6 (patch) | |
tree | 2be8ebefe1d6076233e24f83c378f89819045c26 | |
parent | c3132ab25427845a1f7b5cf20dcc3fe810be606e (diff) |
split: drop removed files from build
Change-Id: I7ace16b179379624d4fb5719fcc3b948efc2181b
-rw-r--r-- | configure.ac | 60 | ||||
-rw-r--r-- | src/Makefile.am | 17 | ||||
-rw-r--r-- | tests/Makefile.am | 33 | ||||
-rw-r--r-- | tests/testsuite.at | 118 |
4 files changed, 0 insertions, 228 deletions
diff --git a/configure.ac b/configure.ac index 7a19b8c5a..a2a5d8a40 100644 --- a/configure.ac +++ b/configure.ac @@ -40,29 +40,9 @@ PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.9.5) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.2.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.6.4) PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.0.1) PKG_CHECK_MODULES(LIBCRYPTO, libcrypto >= 0.9.5) -# Enabke/disable the NAT? -AC_ARG_ENABLE([nat], [AS_HELP_STRING([--enable-nat], [Build the BSC NAT. Requires SCCP])], - [osmo_ac_build_nat="$enableval"],[osmo_ac_build_nat="no"]) -if test "$osmo_ac_build_nat" = "yes" ; then - PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.2) -fi -AM_CONDITIONAL(BUILD_NAT, test "x$osmo_ac_build_nat" = "xyes") -AC_SUBST(osmo_ac_build_nat) - -# Enable/disable the BSC? -AC_ARG_ENABLE([osmo-bsc], [AS_HELP_STRING([--enable-osmo-bsc], [Build the Osmo BSC])], - [osmo_ac_build_bsc="$enableval"],[osmo_ac_build_bsc="no"]) -if test "$osmo_ac_build_bsc" = "yes" ; then - PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.6) - PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran) # TODO version? -fi -AM_CONDITIONAL(BUILD_BSC, test "x$osmo_ac_build_bsc" = "xyes") -AC_SUBST(osmo_ac_build_bsc) - # Enable/disable smpp support in the msc? AC_ARG_ENABLE([smpp], [AS_HELP_STRING([--enable-smpp], [Build the SMPP interface])], [osmo_ac_build_smpp="$enableval"],[osmo_ac_build_smpp="no"]) @@ -101,23 +81,6 @@ fi AM_CONDITIONAL(BUILD_IU, test "x$osmo_ac_iu" = "xyes") AC_SUBST(osmo_ac_iu) - -found_libgtp=yes -PKG_CHECK_MODULES(LIBGTP, libgtp >= 0.92, , found_libgtp=no) -AM_CONDITIONAL(HAVE_LIBGTP, test "$found_libgtp" = yes) -AC_SUBST(found_libgtp) - -found_libcares=yes -PKG_CHECK_MODULES([LIBCARES], [libcares], [], [found_libcares=no]) -AM_CONDITIONAL(HAVE_LIBCARES, test "$found_libcares" = yes) -AC_SUBST(found_libcares) - -found_libgtp_and_libcares=no -if test "$found_libgtp" = "yes" -a "$found_libcares" = "yes"; then - found_libgtp_and_libcares=yes -fi -AC_SUBST(found_libgtp_and_libcares) - dnl checks for header files AC_HEADER_STDC AC_CHECK_HEADERS(dbi/dbd.h,,AC_MSG_ERROR(DBI library is not installed)) @@ -223,44 +186,21 @@ AC_OUTPUT( include/openbsc/Makefile include/Makefile src/Makefile - src/libtrau/Makefile - src/libbsc/Makefile src/libmsc/Makefile src/libvlr/Makefile src/libmgcp/Makefile src/libcommon/Makefile - src/libfilter/Makefile src/libcommon-cs/Makefile src/osmo-msc/Makefile - src/osmo-bsc/Makefile - src/osmo-bsc_nat/Makefile src/osmo-bsc_mgcp/Makefile - src/ipaccess/Makefile src/utils/Makefile - src/gprs/Makefile tests/Makefile tests/atlocal tests/libiudummy/Makefile tests/gsm0408/Makefile - tests/channel/Makefile - tests/bsc/Makefile - tests/bsc-nat/Makefile - tests/bsc-nat-trie/Makefile tests/mgcp/Makefile - tests/gprs/Makefile - tests/gbproxy/Makefile - tests/abis/Makefile tests/smpp/Makefile - tests/trau/Makefile - tests/sgsn/Makefile tests/subscr/Makefile - tests/oap/Makefile - tests/gtphub/Makefile - tests/xid/Makefile - tests/sndcp_xid/Makefile - tests/slhc/Makefile - tests/v42bis/Makefile - tests/nanobts_omlattr/Makefile tests/sms_queue/Makefile tests/msc_vlr/Makefile doc/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index bd697385f..bec18b0e1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,10 +24,7 @@ SUBDIRS = \ libcommon \ libvlr \ libmgcp \ - libbsc \ libmsc \ - libtrau \ - libfilter \ libcommon-cs \ $(NULL) @@ -37,18 +34,4 @@ SUBDIRS += \ osmo-bsc_mgcp \ utils \ ipaccess \ - gprs \ $(NULL) - -# Conditional Programs -if BUILD_NAT -SUBDIRS += \ - osmo-bsc_nat \ - $(NULL) -endif - -if BUILD_BSC -SUBDIRS += \ - osmo-bsc \ - $(NULL) -endif diff --git a/tests/Makefile.am b/tests/Makefile.am index 8aab0b002..ebd9777d2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,50 +1,17 @@ SUBDIRS = \ libiudummy \ gsm0408 \ - channel \ mgcp \ - gprs \ - abis \ - gbproxy \ - trau \ subscr \ - nanobts_omlattr \ sms_queue \ msc_vlr \ $(NULL) -if BUILD_NAT -SUBDIRS += \ - bsc-nat \ - bsc-nat-trie \ - $(NULL) -endif -if BUILD_BSC -SUBDIRS += \ - bsc \ - $(NULL) -endif if BUILD_SMPP SUBDIRS += \ smpp \ $(NULL) endif -if HAVE_LIBGTP -SUBDIRS += \ - gtphub \ - $(NULL) - -if HAVE_LIBCARES -SUBDIRS += \ - sgsn \ - oap \ - xid \ - sndcp_xid \ - slhc \ - v42bis \ - $(NULL) -endif -endif # The `:;' works around a Bash 3.2 bug when the output is not writeable. $(srcdir)/package.m4: $(top_srcdir)/configure.ac diff --git a/tests/testsuite.at b/tests/testsuite.at index f21ba0c4d..408714633 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -7,19 +7,6 @@ cat $abs_srcdir/gsm0408/gsm0408_test.ok > expout AT_CHECK([$abs_top_builddir/tests/gsm0408/gsm0408_test], [], [expout], [ignore]) AT_CLEANUP -AT_SETUP([bsc_subscr]) -AT_KEYWORDS([bsc_subscr]) -cat $abs_srcdir/subscr/bsc_subscr_test.ok > expout -cat $abs_srcdir/subscr/bsc_subscr_test.err > experr -AT_CHECK([$abs_top_builddir/tests/subscr/bsc_subscr_test], [], [expout], [experr]) -AT_CLEANUP - -AT_SETUP([channel]) -AT_KEYWORDS([channel]) -cat $abs_srcdir/channel/channel_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/channel/channel_test], [], [expout], [ignore]) -AT_CLEANUP - AT_SETUP([mgcp]) AT_KEYWORDS([mgcp]) cat $abs_srcdir/mgcp/mgcp_test.ok > expout @@ -40,22 +27,6 @@ cat $abs_srcdir/mgcp/mgcpgw_client_test.err > experr AT_CHECK([$abs_top_builddir/tests/mgcp/mgcpgw_client_test], [], [expout], [experr]) AT_CLEANUP -AT_SETUP([gprs]) -AT_KEYWORDS([gprs]) -cat $abs_srcdir/gprs/gprs_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/gprs/gprs_test], [], [expout], [ignore]) -AT_CLEANUP - -AT_SETUP([bsc-nat]) -AT_KEYWORDS([bsc-nat]) -AT_CHECK([test "$enable_nat_test" != no || exit 77]) -cp $abs_srcdir/bsc-nat/prefixes.csv . -cp $abs_srcdir/bsc-nat/barr.cfg . -cp $abs_srcdir/bsc-nat/barr_dup.cfg . -cat $abs_srcdir/bsc-nat/bsc_nat_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/bsc-nat/bsc_nat_test], [], [expout], [ignore]) -AT_CLEANUP - AT_SETUP([smpp]) AT_KEYWORDS([smpp]) AT_CHECK([test "$enable_smpp_test" != no || exit 77]) @@ -64,95 +35,6 @@ cat $abs_srcdir/smpp/smpp_test.err > experr AT_CHECK([$abs_top_builddir/tests/smpp/smpp_test], [], [expout], [experr]) AT_CLEANUP -AT_SETUP([bsc-nat-trie]) -AT_KEYWORDS([bsc-nat-trie]) -AT_CHECK([test "$enable_nat_test" != no || exit 77]) -cp $abs_srcdir/bsc-nat-trie/prefixes.csv . -cat $abs_srcdir/bsc-nat-trie/bsc_nat_trie_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/bsc-nat-trie/bsc_nat_trie_test], [], [expout], [ignore]) -AT_CLEANUP - -AT_SETUP([abis]) -AT_KEYWORDS([abis]) -cat $abs_srcdir/abis/abis_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/abis/abis_test], [], [expout], [ignore]) -AT_CLEANUP - -AT_SETUP([bsc]) -AT_KEYWORDS([bsc]) -AT_CHECK([test "$enable_bsc_test" != no || exit 77]) -cat $abs_srcdir/bsc/bsc_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/bsc/bsc_test], [], [expout], [ignore]) -AT_CLEANUP - -AT_SETUP([gbproxy]) -AT_KEYWORDS([gbproxy]) -cat $abs_srcdir/gbproxy/gbproxy_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/gbproxy/gbproxy_test], [], [expout], [ignore]) -AT_CLEANUP - -AT_SETUP([trau]) -AT_KEYWORDS([trau]) -cat $abs_srcdir/trau/trau_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/trau/trau_test], [], [expout], [ignore]) -AT_CLEANUP - -AT_SETUP([sgsn]) -AT_KEYWORDS([sgsn]) -AT_CHECK([test "$enable_sgsn_test" != no || exit 77]) -cat $abs_srcdir/sgsn/sgsn_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/sgsn/sgsn_test], [], [expout], [ignore]) -AT_CLEANUP - -AT_SETUP([oap]) -AT_KEYWORDS([oap]) -AT_CHECK([test "$enable_oap_test" != no || exit 77]) -cat $abs_srcdir/oap/oap_client_test.ok > expout -cat $abs_srcdir/oap/oap_client_test.err > experr -AT_CHECK([$abs_top_builddir/tests/oap/oap_client_test], [], [expout], [experr]) -AT_CLEANUP - -AT_SETUP([gtphub]) -AT_KEYWORDS([gtphub]) -AT_CHECK([test "$enable_gtphub_test" != no || exit 77]) -cat $abs_srcdir/gtphub/gtphub_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/gtphub/gtphub_test], [], [expout], [ignore]) -AT_CLEANUP - -AT_SETUP([xid]) -AT_KEYWORDS([xid]) -AT_CHECK([test "$enable_sgsn_test" != no || exit 77]) -cat $abs_srcdir/xid/xid_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/xid/xid_test], [], [expout], [ignore]) -AT_CLEANUP - -AT_SETUP([sndcp_xid]) -AT_KEYWORDS([sndcp_xid]) -AT_CHECK([test "$enable_sgsn_test" != no || exit 77]) -cat $abs_srcdir/sndcp_xid/sndcp_xid_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/sndcp_xid/sndcp_xid_test], [], [expout], [ignore]) -AT_CLEANUP - -AT_SETUP([slhc]) -AT_KEYWORDS([slhc]) -AT_CHECK([test "$enable_sgsn_test" != no || exit 77]) -cat $abs_srcdir/slhc/slhc_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/slhc/slhc_test], [], [expout], [ignore]) -AT_CLEANUP - -AT_SETUP([v42bis]) -AT_KEYWORDS([v42bis]) -AT_CHECK([test "$enable_sgsn_test" != no || exit 77]) -cat $abs_srcdir/v42bis/v42bis_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/v42bis/v42bis_test], [], [expout], [ignore]) -AT_CLEANUP - -AT_SETUP([nanobts_omlattr]) -AT_KEYWORDS([nanobts_omlattr]) -cat $abs_srcdir/nanobts_omlattr/nanobts_omlattr_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/nanobts_omlattr/nanobts_omlattr_test], [], [expout], [ignore]) -AT_CLEANUP - AT_SETUP([sms_queue_test]) AT_KEYWORDS([sms_queue_test]) cat $abs_srcdir/sms_queue/sms_queue_test.ok > expout |