laforge has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-bts/+/18696 )

Change subject: osmo-bts-trx: prettify Makefile.am: make it git friendly
......................................................................

osmo-bts-trx: prettify Makefile.am: make it git friendly

Change-Id: I0991910e0ffa6140f20c49bd2f0ad9b42cf231ba
---
M src/osmo-bts-trx/Makefile.am
1 file changed, 48 insertions(+), 6 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bts-trx/Makefile.am b/src/osmo-bts-trx/Makefile.am
index 1922240..85c1ff4 100644
--- a/src/osmo-bts-trx/Makefile.am
+++ b/src/osmo-bts-trx/Makefile.am
@@ -1,10 +1,52 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) 
$(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOCODING_CFLAGS) 
$(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) 
$(LIBOSMOCTRL_CFLAGS)
-LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) 
$(LIBOSMOCODING_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) 
$(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) -ldl
+AM_CPPFLAGS = \
+       $(all_includes) \
+       -I$(top_srcdir)/include \
+       $(NULL)

-EXTRA_DIST = trx_if.h l1_if.h loops.h
+AM_CFLAGS = \
+       -Wall -fno-strict-aliasing \
+       $(LIBOSMOCORE_CFLAGS) \
+       $(LIBOSMOGSM_CFLAGS) \
+       $(LIBOSMOCODEC_CFLAGS) \
+       $(LIBOSMOCODING_CFLAGS) \
+       $(LIBOSMOVTY_CFLAGS) \
+       $(LIBOSMOTRAU_CFLAGS) \
+       $(LIBOSMOABIS_CFLAGS) \
+       $(LIBOSMOCTRL_CFLAGS) \
+       $(NULL)
+
+LDADD = \
+       $(LIBOSMOCORE_LIBS) \
+       $(LIBOSMOGSM_LIBS) \
+       $(LIBOSMOCODEC_LIBS) \
+       $(LIBOSMOCODING_LIBS) \
+       $(LIBOSMOVTY_LIBS) \
+       $(LIBOSMOTRAU_LIBS) \
+       $(LIBOSMOABIS_LIBS) \
+       $(LIBOSMOCTRL_LIBS) \
+       -ldl \
+       $(NULL)
+
+# TODO: use noinst_HEADERS instead?
+EXTRA_DIST = \
+       trx_if.h \
+       l1_if.h \
+       loops.h \
+       $(NULL)

 bin_PROGRAMS = osmo-bts-trx

-osmo_bts_trx_SOURCES = main.c trx_if.c l1_if.c scheduler_trx.c trx_vty.c 
loops.c
-osmo_bts_trx_LDADD = $(top_builddir)/src/common/libl1sched.a 
$(top_builddir)/src/common/libbts.a $(LDADD)
+osmo_bts_trx_SOURCES = \
+       main.c \
+       trx_if.c \
+       l1_if.c \
+       scheduler_trx.c \
+       trx_vty.c \
+       loops.c \
+       $(NULL)
+
+osmo_bts_trx_LDADD = \
+       $(top_builddir)/src/common/libl1sched.a \
+       $(top_builddir)/src/common/libbts.a \
+       $(LDADD) \
+       $(NULL)

--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18696
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I0991910e0ffa6140f20c49bd2f0ad9b42cf231ba
Gerrit-Change-Number: 18696
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-MessageType: merged

Reply via email to