sim-card
/
osmo-remsim
mirror of https://gerrit.osmocom.org/osmo-remsim
10
0
Fork 0
Code Issues Releases Wiki Activity

introduce --disable-remsim-client-{st2,ifdhanndler} 

Change-Id: I4aaeeedc9df873f2e7edfbfab587fec2dfad85c4
This commit is contained in:
Harald Welte 2020-03-14 18:19:13 +01:00
parent afc6c6881d
commit a3ab5f20d7
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
configure.ac
View File

@ -55,20 +55,28 @@ AC_ARG_ENABLE([remsim-bankd],[AS_HELP_STRING([--disable-remsim-bankd], [Build os
[osmo_ac_build_bankd="$enableval"],[osmo_ac_build_bankd="yes"])
if test "$osmo_ac_build_bankd" = "yes"; then
AC_DEFINE(BUILD_BANKD, 1, [Define if we want to build osmo-remsim-bankd])
PKG_CHECK_MODULES(OSMOSIM, libosmosim)
PKG_CHECK_MODULES(PCSC, libpcsclite)
fi
AM_CONDITIONAL(BUILD_BANKD, test "x$osmo_ac_build_bankd" = "xyes")
AC_SUBST(BUILD_BANKD)
AC_ARG_ENABLE([remsim-client],[AS_HELP_STRING([--disable-remsim-client], [Build osmo-remsim-client])],
[osmo_ac_build_client="$enableval"],[osmo_ac_build_client="yes"])
if test "$osmo_ac_build_client" = "yes"; then
AC_DEFINE(BUILD_CLIENT, 1, [Define if we want to build osmo-remsim-client])
PKG_CHECK_MODULES(OSMOSIM, libosmosim)
AC_ARG_ENABLE([remsim-client-st2],[AS_HELP_STRING([--disable-remsim-client-st2], [Build osmo-remsim-client-st2])],
[osmo_ac_build_client_st2="$enableval"],[osmo_ac_build_client_st2="yes"])
if test "$osmo_ac_build_client_st2" = "yes"; then
AC_DEFINE(BUILD_CLIENT_ST2, 1, [Define if we want to build osmo-remsim-client-st2])
PKG_CHECK_MODULES(OSMOUSB, libosmousb)
PKG_CHECK_MODULES(OSMOSIMTRACE2, libosmo-simtrace2)
PKG_CHECK_MODULES(USB, libusb-1.0)
fi
AM_CONDITIONAL(BUILD_CLIENT_ST2, test "x$osmo_ac_build_client_st2" = "xyes")
AC_SUBST(BUILD_CLIENT_ST2)
AC_ARG_ENABLE([remsim-client-ifdhandler],[AS_HELP_STRING([--disable-remsim-client-ifdhandler],
[Build osmo-remsim-client-ifdhandler])],
[osmo_ac_build_client_ifdhandler="$enableval"],[osmo_ac_build_client_ifdhandler="yes"])
if test "$osmo_ac_build_client_ifdhandler" = "yes"; then
AC_DEFINE(BUILD_CLIENT_IFDHANDLER, 1, [Define if we want to build osmo-remsim-client-ifdhandler])
PKG_CHECK_MODULES(PCSC, libpcsclite)
ifd_dropdir=`pkg-config --variable=usbdropdir libpcsclite`
# allow user to override the dropdir for the PCSC driver bundle
@ -80,8 +88,8 @@ if test "$osmo_ac_build_client" = "yes"; then
[serialconfdir="${withval}"], [serialconfdir="${_serialconfdir}"])
AC_SUBST(serialconfdir)
fi
AM_CONDITIONAL(BUILD_CLIENT, test "x$osmo_ac_build_client" = "xyes")
AC_SUBST(BUILD_CLIENT)
AM_CONDITIONAL(BUILD_CLIENT_IFDHANDLER, test "x$osmo_ac_build_client_ifdhandler" = "xyes")
AC_SUBST(BUILD_CLIENT_IFDHANDLER)
AC_CONFIG_MACRO_DIR([m4])

2
src/Makefile.am
View File

@ -5,9 +5,7 @@ endif
if BUILD_SERVER
SUBDIRS += server
endif
if BUILD_CLIENT
SUBDIRS += client
endif
AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include \
$(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) \

7
src/client/Makefile.am
View File

@ -4,7 +4,7 @@ AM_CFLAGS = -Wall -I$(top_srcdir)/include -I/$(top_builddir)/include -I$(top_src
$(OSMOSIMTRACE2_CFLAGS) \
-I$(top_srcdir)/include/osmocom/rspro
bin_PROGRAMS = osmo-remsim-client-st2 osmo-remsim-client-shell
bin_PROGRAMS = osmo-remsim-client-shell
osmo_remsim_client_shell_SOURCES = user_shell.c remsim_client_main.c \
remsim_client.c main_fsm.c ../rspro_client_fsm.c ../debug.c
@ -12,6 +12,7 @@ osmo_remsim_client_shell_CFLAGS = $(AM_CFLAGS)
osmo_remsim_client_shell_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \
$(top_builddir)/src/libosmo-rspro.la
if BUILD_CLIENT_IFDHANDLER
EXTRA_DIST=PkgInfo osmo-remsim-client-reader_conf.in
serialconf_DATA=osmo-remsim-client-reader_conf
bundledir=$(usbdropdir)/libifd-osmo-remsim-client.bundle/Contents
@ -25,7 +26,10 @@ libifd_remsim_client_la_CPPFLAGS = $(PCSC_CFLAGS)
libifd_remsim_client_la_LDFLAGS = -no-undefined
libifd_remsim_client_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \
$(top_builddir)/src/libosmo-rspro.la
endif
if BUILD_CLIENT_ST2
bin_PROGRAMS += osmo-remsim-client-st2
osmo_remsim_client_st2_SOURCES = user_simtrace2.c remsim_client_main.c \
remsim_client.c main_fsm.c ../rspro_client_fsm.c ../debug.c
osmo_remsim_client_st2_CPPFLAGS = -DUSB_SUPPORT
@ -34,5 +38,6 @@ osmo_remsim_client_st2_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS)
$(OSMOUSB_LIBS) $(OSMOSIMTRACE2_LIBS) \
$(USB_LIBS) \
$(top_builddir)/src/libosmo-rspro.la
endif
noinst_HEADERS = client.h