laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29175 ) Change subject: layer23: cosmetic: make Makefile.am files git-friendly ...................................................................... layer23: cosmetic: make Makefile.am files git-friendly Change-Id: I26d7ff4ae278b5b465863252fe12ac1b46780dc7 --- M src/host/layer23/src/common/Makefile.am M src/host/layer23/src/misc/Makefile.am M src/host/layer23/src/mobile/Makefile.am 3 files changed, 123 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/host/layer23/src/common/Makefile.am b/src/host/layer23/src/common/Makefile.am index a8d9f7e..6705ef9 100644 --- a/src/host/layer23/src/common/Makefile.am +++ b/src/host/layer23/src/common/Makefile.am @@ -1,6 +1,27 @@ -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBGPS_CFLAGS) +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBGPS_CFLAGS) \ + $(NULL) noinst_LIBRARIES = liblayer23.a -liblayer23_a_SOURCES = l1ctl.c l1l2_interface.c sap_fsm.c sap_proto.c sap_interface.c \ - logging.c networks.c sim.c sysinfo.c gps.c l1ctl_lapdm_glue.c utils.c +liblayer23_a_SOURCES = \ + gps.c \ + l1ctl.c \ + l1l2_interface.c \ + l1ctl_lapdm_glue.c \ + logging.c \ + networks.c \ + sap_fsm.c \ + sap_proto.c \ + sap_interface.c \ + sim.c \ + sysinfo.c \ + utils.c \ + $(NULL) diff --git a/src/host/layer23/src/misc/Makefile.am b/src/host/layer23/src/misc/Makefile.am index 78ab962..3d32592 100644 --- a/src/host/layer23/src/misc/Makefile.am +++ b/src/host/layer23/src/misc/Makefile.am @@ -1,14 +1,62 @@ -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBGPS_CFLAGS) -LDADD = ../common/liblayer23.a $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBGPS_LIBS) +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + $(NULL) -bin_PROGRAMS = bcch_scan ccch_scan echo_test cell_log cbch_sniff +AM_CFLAGS = \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBGPS_CFLAGS) \ + $(NULL) -noinst_HEADERS = bcch_scan.h geo.h +LDADD = \ + ../common/liblayer23.a \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOCODEC_LIBS) \ + $(LIBGPS_LIBS) \ + $(NULL) -bcch_scan_SOURCES = ../common/main.c app_bcch_scan.c bcch_scan.c -ccch_scan_SOURCES = ../common/main.c app_ccch_scan.c rslms.c -echo_test_SOURCES = ../common/main.c app_echo_test.c +bin_PROGRAMS = \ + bcch_scan \ + ccch_scan \ + echo_test \ + cell_log \ + cbch_sniff \ + $(NULL) + +noinst_HEADERS = \ + bcch_scan.h \ + geo.h \ + $(NULL) + +bcch_scan_SOURCES = \ + ../common/main.c \ + app_bcch_scan.c \ + bcch_scan.c \ + $(NULL) + +ccch_scan_SOURCES = \ + ../common/main.c \ + app_ccch_scan.c \ + rslms.c \ + $(NULL) + +echo_test_SOURCES = \ + ../common/main.c \ + app_echo_test.c \ + $(NULL) + cell_log_LDADD = $(LDADD) -lm -cell_log_SOURCES = ../common/main.c app_cell_log.c cell_log.c geo.c -cbch_sniff_SOURCES = ../common/main.c app_cbch_sniff.c +cell_log_SOURCES = \ + ../common/main.c \ + app_cell_log.c \ + cell_log.c \ + geo.c \ + $(NULL) + +cbch_sniff_SOURCES = \ + ../common/main.c \ + app_cbch_sniff.c \ + $(NULL) diff --git a/src/host/layer23/src/mobile/Makefile.am b/src/host/layer23/src/mobile/Makefile.am index 783ae16..00f10a9 100644 --- a/src/host/layer23/src/mobile/Makefile.am +++ b/src/host/layer23/src/mobile/Makefile.am @@ -1,16 +1,49 @@ -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBGPS_CFLAGS) $(LIBLUA_CFLAGS) -LDADD = ../common/liblayer23.a $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBGPS_LIBS) $(LIBLUA_LIBS) +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBGPS_CFLAGS) \ + $(LIBLUA_CFLAGS) \ + $(NULL) noinst_LIBRARIES = libmobile.a -libmobile_a_SOURCES = gsm322.c gsm480_ss.c gsm411_sms.c gsm48_cc.c gsm48_mm.c \ - gsm48_rr.c gsm414.c mnccms.c settings.c subscriber.c support.c \ - transaction.c vty_interface.c voice.c mncc_sock.c primitives.c +libmobile_a_SOURCES = \ + gsm322.c \ + gsm480_ss.c \ + gsm411_sms.c \ + gsm48_cc.c \ + gsm48_mm.c \ + gsm48_rr.c \ + gsm414.c \ + mnccms.c \ + mncc_sock.c \ + primitives.c \ + settings.c \ + subscriber.c \ + support.c \ + transaction.c \ + vty_interface.c \ + voice.c \ + $(NULL) bin_PROGRAMS = mobile mobile_SOURCES = main.c app_mobile.c -mobile_LDADD = libmobile.a $(LDADD) +mobile_LDADD = \ + libmobile.a \ + ../common/liblayer23.a \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOCODEC_LIBS) \ + $(LIBGPS_LIBS) \ + $(LIBLUA_LIBS) \ + $(NULL) # lua support if BUILD_LUA -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I26d7ff4ae278b5b465863252fe12ac1b46780dc7 Gerrit-Change-Number: 29175 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged