jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/44069?usp=email ) Change subject: Move commonly used remsim-client code into .a file ...................................................................... Move commonly used remsim-client code into .a file Clean up the Makefile.am by moving all commonly used code into a 'noinst' library. Change-Id: I2ba00fde01ab6a8a2b0972fb5eee16f9cf61967e --- M src/client/Makefile.am 1 file changed, 18 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/69/44069/1 diff --git a/src/client/Makefile.am b/src/client/Makefile.am index 6c7abc6..5ddd58f 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -10,12 +10,21 @@ $(OSMOSIMTRACE2_CFLAGS) \ $(NULL) +noinst_LTLIBRARIES = libremsim_client_common.la + +libremsim_client_common_la_SOURCES = \ + remsim_client.c \ + main_fsm.c \ + ../rspro_client_fsm.c \ + ../debug.c \ + $(NULL) + 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 +osmo_remsim_client_shell_SOURCES = user_shell.c remsim_client_main.c osmo_remsim_client_shell_CFLAGS = $(AM_CFLAGS) -osmo_remsim_client_shell_LDADD = $(top_builddir)/src/libosmo-rspro.la \ +osmo_remsim_client_shell_LDADD = $(builddir)/libremsim_client_common.la \ + $(top_builddir)/src/libosmo-rspro.la \ $(OSMONETIF_LIBS) \ $(OSMOGSM_LIBS) \ $(OSMOCORE_LIBS) \ @@ -28,12 +37,12 @@ bundle_DATA=PkgInfo bundlelinuxdir=$(bundledir)/Linux bundlelinux_LTLIBRARIES = libifd_remsim_client.la -libifd_remsim_client_la_SOURCES = user_ifdhandler.c \ - remsim_client.c main_fsm.c ../rspro_client_fsm.c ../debug.c +libifd_remsim_client_la_SOURCES = user_ifdhandler.c libifd_remsim_client_la_CFLAGS = $(AM_CFLAGS) libifd_remsim_client_la_CPPFLAGS = $(PCSC_CFLAGS) libifd_remsim_client_la_LDFLAGS = -no-undefined -libifd_remsim_client_la_LIBADD = $(top_builddir)/src/libosmo-rspro.la \ +libifd_remsim_client_la_LIBADD = $(builddir)/libremsim_client_common.la \ + $(top_builddir)/src/libosmo-rspro.la \ $(OSMONETIF_LIBS) \ $(OSMOGSM_LIBS) \ $(OSMOCORE_LIBS) \ @@ -42,11 +51,11 @@ 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_SOURCES = user_simtrace2.c remsim_client_main.c osmo_remsim_client_st2_CPPFLAGS = -DUSB_SUPPORT -DSIMTRACE_SUPPORT osmo_remsim_client_st2_CFLAGS = $(AM_CFLAGS) -osmo_remsim_client_st2_LDADD = $(top_builddir)/src/libosmo-rspro.la \ +osmo_remsim_client_st2_LDADD = $(builddir)/libremsim_client_common.la \ + $(top_builddir)/src/libosmo-rspro.la \ $(OSMONETIF_LIBS) \ $(OSMOSIMTRACE2_LIBS) \ $(OSMOGSM_LIBS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/44069?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I2ba00fde01ab6a8a2b0972fb5eee16f9cf61967e Gerrit-Change-Number: 44069 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas@eversberg.eu>