remsim-client: Port from local copy to libosmousb + libosmo-simtrace2
We originally imported a copy of [most of] the code of
simtrace2.git/host into this repository. That was a quick hack to get
things going, but now that simtrace2.git is providing a shared library
of simtrace2 utility functions, let's migrate over to it.
At the same time, some functions (libusb_util) have been migrated to
libosmousb (a new library in libosmocore.git), so we must add that
as new dependency, too.
This performs the minimally required changes and is *not* a proper
port to the libosmousb osmocore select loop integration, whcih will
follow in a separate patch.
Change-Id: Idf5a861f4dacbec3c664f4ced6e03d8662c73112
Closes: OS#4298
Related: OS#4299
Depends: libosmocore.git I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3
diff --git a/src/Makefile.am b/src/Makefile.am
index 35da621..58f02e8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,7 @@
AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include \
$(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) \
$(PCSC_CFLAGS) $(USB_CFLAGS) $(OSMOSIM_CFLAGS) \
+ $(OSMOSIMTRACE2_CFLAGS) \
-I$(top_srcdir)/include/osmocom/rspro
RSPRO_LIBVERSION=1:0:0
@@ -19,12 +20,7 @@
libosmo_rspro_la_SOURCES = rspro_util.c asn1c_helpers.c
noinst_HEADERS = debug.h client.h rspro_util.h slotmap.h rspro_client_fsm.h \
- asn1c_helpers.h \
- simtrace2/apdu_dispatch.h \
- simtrace2/libusb_util.h \
- simtrace2/simtrace2-discovery.h \
- simtrace2/simtrace_prot.h \
- simtrace2/simtrace_usb.h
+ asn1c_helpers.h
bin_PROGRAMS = osmo-remsim-client-st2
@@ -33,9 +29,7 @@
libosmo-rspro.la
osmo_remsim_client_st2_SOURCES = simtrace2-remsim_client.c \
- rspro_client_fsm.c debug.c \
- simtrace2/apdu_dispatch.c \
- simtrace2/simtrace2-discovery.c \
- simtrace2/libusb_util.c
+ rspro_client_fsm.c debug.c
osmo_remsim_client_st2_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \
+ $(OSMOUSB_LIBS) $(OSMOSIMTRACE2_LIBS) \
$(USB_LIBS) $(OSMOSIM_LIBS) libosmo-rspro.la