pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/39020?usp=email )
Change subject: Makefile:am: Improve formatting and order of CFLAGS and LIBS ......................................................................
Makefile:am: Improve formatting and order of CFLAGS and LIBS
Place osmocom libraries in proper dependency order.
Change-Id: Ia766a09103d2216258a83cc98899e6cae4b0351d --- M src/Makefile.am M src/bankd/Makefile.am M src/client/Makefile.am M src/server/Makefile.am 4 files changed, 39 insertions(+), 15 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/20/39020/1
diff --git a/src/Makefile.am b/src/Makefile.am index b305ce2..5c10373 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,9 @@ SUBDIRS += client
AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include \ - $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) \ + $(OSMOABIS_CFLAGS) \ + $(OSMOGSM_CFLAGS) \ + $(OSMOCORE_CFLAGS) \ -I$(top_srcdir)/include/osmocom/rspro
RSPRO_LIBVERSION=2:0:0 diff --git a/src/bankd/Makefile.am b/src/bankd/Makefile.am index 4899aef..937464b 100644 --- a/src/bankd/Makefile.am +++ b/src/bankd/Makefile.am @@ -1,6 +1,8 @@ AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src \ -I$(top_srcdir)/include/osmocom/rspro \ - $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) \ + $(OSMOABIS_CFLAGS) \ + $(OSMOGSM_CFLAGS) \ + $(OSMOCORE_CFLAGS) \ $(PCSC_CFLAGS)
noinst_HEADERS = bankd.h internal.h gsmtap.h @@ -14,8 +16,12 @@
osmo_remsim_bankd_SOURCES = ../slotmap.c ../rspro_client_fsm.c ../debug.c \ bankd_main.c bankd_pcsc.c gsmtap.c -osmo_remsim_bankd_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \ - $(PCSC_LIBS) $(CSV_LIBS) $(top_builddir)/src/libosmo-rspro.la +osmo_remsim_bankd_LDADD = $(OSMOABIS_LIBS) \ + $(OSMOGSM_LIBS) \ + $(OSMOCORE_LIBS) \ + $(PCSC_LIBS) \ + $(CSV_LIBS) \ + $(top_builddir)/src/libosmo-rspro.la
# as suggested in http://lists.gnu.org/archive/html/automake/2009-03/msg00011.html FORCE: diff --git a/src/client/Makefile.am b/src/client/Makefile.am index f158424..069206e 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -1,5 +1,7 @@ AM_CFLAGS = -Wall -I$(top_srcdir)/include -I/$(top_builddir)/include -I$(top_srcdir)/src \ - $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) \ + $(OSMOABIS_CFLAGS) \ + $(OSMOGSM_CFLAGS) \ + $(OSMOCORE_CFLAGS) \ $(PCSC_CFLAGS) $(USB_CFLAGS) \ $(OSMOSIMTRACE2_CFLAGS) \ -I$(top_srcdir)/include/osmocom/rspro @@ -9,8 +11,10 @@ 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_CFLAGS = $(AM_CFLAGS) -osmo_remsim_client_shell_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \ - $(top_builddir)/src/libosmo-rspro.la +osmo_remsim_client_shell_LDADD = $(OSMOABIS_LIBS) \ + $(OSMOGSM_LIBS) \ + $(OSMOCORE_LIBS) \ + $(top_builddir)/src/libosmo-rspro.la
if BUILD_CLIENT_IFDHANDLER EXTRA_DIST=PkgInfo osmo-remsim-client-reader_conf.in @@ -24,8 +28,10 @@ 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 = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \ - $(top_builddir)/src/libosmo-rspro.la +libifd_remsim_client_la_LIBADD = $(OSMOABIS_LIBS) \ + $(OSMOGSM_LIBS) \ + $(OSMOCORE_LIBS) \ + $(top_builddir)/src/libosmo-rspro.la endif
if BUILD_CLIENT_ST2 @@ -34,10 +40,12 @@ remsim_client.c main_fsm.c ../rspro_client_fsm.c ../debug.c osmo_remsim_client_st2_CPPFLAGS = -DUSB_SUPPORT -DSIMTRACE_SUPPORT osmo_remsim_client_st2_CFLAGS = $(AM_CFLAGS) -osmo_remsim_client_st2_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \ +osmo_remsim_client_st2_LDADD = $(OSMOABIS_LIBS) \ + $(OSMOGSM_LIBS) \ + $(OSMOCORE_LIBS) \ $(OSMOUSB_LIBS) $(OSMOSIMTRACE2_LIBS) \ $(USB_LIBS) \ $(top_builddir)/src/libosmo-rspro.la endif
-noinst_HEADERS = client.h +noinst_HEADERS = client.h diff --git a/src/server/Makefile.am b/src/server/Makefile.am index f6278a3..b51ea94 100644 --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -1,8 +1,12 @@
AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src \ -I$(top_srcdir)/include/osmocom/rspro \ - $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) \ - $(ULFIUS_CFLAGS) $(JANSSON_CFLAGS) $(ORCANIA_CFLAGS) + $(OSMOABIS_CFLAGS) \ + $(OSMOGSM_CFLAGS) \ + $(OSMOCORE_CFLAGS) \ + $(ULFIUS_CFLAGS) \ + $(JANSSON_CFLAGS) \ + $(ORCANIA_CFLAGS)
noinst_HEADERS = rspro_server.h rest_api.h
@@ -10,8 +14,12 @@
osmo_remsim_server_SOURCES = remsim_server.c rspro_server.c rest_api.c \ ../rspro_util.c ../slotmap.c ../debug.c -osmo_remsim_server_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \ - $(ULFIUS_LIBS) $(JANSSON_LIBS) $(ORCANIA_LIBS) \ +osmo_remsim_server_LDADD = $(OSMOABIS_LIBS) \ + $(OSMOGSM_LIBS) \ + $(OSMOCORE_LIBS) \ + $(ULFIUS_LIBS) \ + $(JANSSON_LIBS) \ + $(ORCANIA_LIBS) \ $(top_builddir)/src/libosmo-rspro.la
# as suggested in http://lists.gnu.org/archive/html/automake/2009-03/msg00011.html