pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-bts/+/29031 )


Change subject: Clean up osmo-bts-*/Makefile.am
......................................................................

Clean up osmo-bts-*/Makefile.am

Change-Id: I24ecfa1167b806dcb3a5a0c00343299df842a78b
---
M src/osmo-bts-lc15/Makefile.am
M src/osmo-bts-oc2g/Makefile.am
M src/osmo-bts-octphy/Makefile.am
M src/osmo-bts-omldummy/Makefile.am
M src/osmo-bts-sysmo/Makefile.am
M src/osmo-bts-virtual/Makefile.am
6 files changed, 303 insertions(+), 51 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/31/29031/1

diff --git a/src/osmo-bts-lc15/Makefile.am b/src/osmo-bts-lc15/Makefile.am
index bb68efa..607ce35 100644
--- a/src/osmo-bts-lc15/Makefile.am
+++ b/src/osmo-bts-lc15/Makefile.am
@@ -1,38 +1,99 @@
 AUTOMAKE_OPTIONS = subdir-objects

 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(LITECELL15_INCDIR)
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) 
$(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) 
$(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) 
$(LIBGPS_CFLAGS) $(LIBSYSTEMD_CFLAGS)
-COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) 
$(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS)
+
+AM_CFLAGS = \
+       -Wall \
+       $(LIBOSMOCORE_CFLAGS) \
+       $(LIBOSMOCODEC_CFLAGS) \
+       $(LIBOSMOGSM_CFLAGS) \
+       $(LIBOSMOVTY_CFLAGS) \
+       $(LIBOSMOTRAU_CFLAGS) \
+       $(LIBOSMOCTRL_CFLAGS) \
+       $(LIBOSMOABIS_CFLAGS) \
+       $(LIBGPS_CFLAGS) \
+       $(LIBSYSTEMD_CFLAGS) \
+       $(NULL)
+
+COMMON_LDADD = \
+       $(LIBOSMOCORE_LIBS) \
+       $(LIBOSMOCODEC_LIBS) \
+       $(LIBOSMOGSM_LIBS) \
+       $(LIBOSMOVTY_LIBS) \
+       $(LIBOSMOTRAU_LIBS) \
+       $(LIBOSMOCTRL_LIBS) \
+       $(LIBOSMOABIS_LIBS) \
+       $(NULL)

 AM_CFLAGS += -DENABLE_LC15BTS

-EXTRA_DIST = misc/lc15bts_mgr.h misc/lc15bts_misc.h misc/lc15bts_par.h 
misc/lc15bts_led.h \
-       misc/lc15bts_temp.h misc/lc15bts_power.h misc/lc15bts_clock.h \
-       misc/lc15bts_bid.h misc/lc15bts_nl.h misc/lc15bts_bts.h 
misc/lc15bts_swd.h \
-       hw_misc.h l1_if.h l1_transp.h lc15bts.h utils.h
+EXTRA_DIST = \
+       misc/lc15bts_mgr.h \
+       misc/lc15bts_misc.h \
+       misc/lc15bts_par.h \
+       misc/lc15bts_led.h \
+       misc/lc15bts_temp.h \
+       misc/lc15bts_power.h \
+       misc/lc15bts_clock.h \
+       misc/lc15bts_bid.h \
+       misc/lc15bts_nl.h \
+       misc/lc15bts_bts.h \
+       misc/lc15bts_swd.h \
+       hw_misc.h \
+       l1_if.h \
+       l1_transp.h \
+       lc15bts.h \
+       utils.h \
+       $(NULL)

 bin_PROGRAMS = osmo-bts-lc15 lc15bts-mgr lc15bts-util

-COMMON_SOURCES = main.c lc15bts.c l1_if.c oml.c lc15bts_vty.c tch.c hw_misc.c 
calib_file.c \
-                utils.c misc/lc15bts_par.c misc/lc15bts_bid.c
+COMMON_SOURCES = \
+       main.c \
+       lc15bts.c \
+       l1_if.c \
+       oml.c \
+       lc15bts_vty.c \
+       tch.c \
+       hw_misc.c \
+       calib_file.c \
+       utils.c \
+       misc/lc15bts_par.c \
+       misc/lc15bts_bid.c \
+       $(NULL)

 osmo_bts_lc15_SOURCES = $(COMMON_SOURCES) l1_transp_hw.c
-osmo_bts_lc15_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD)
+osmo_bts_lc15_LDADD = \
+       $(top_builddir)/src/common/libbts.a \
+       $(COMMON_LDADD) \
+       $(NULL)

 lc15bts_mgr_SOURCES = \
-               misc/lc15bts_mgr.c misc/lc15bts_misc.c \
-               misc/lc15bts_par.c misc/lc15bts_nl.c \
-               misc/lc15bts_temp.c misc/lc15bts_power.c \
-               misc/lc15bts_clock.c misc/lc15bts_bid.c \
+               misc/lc15bts_mgr.c \
+               misc/lc15bts_misc.c \
+               misc/lc15bts_par.c \
+               misc/lc15bts_nl.c \
+               misc/lc15bts_temp.c \
+               misc/lc15bts_power.c \
+               misc/lc15bts_clock.c \
+               misc/lc15bts_bid.c \
                misc/lc15bts_mgr_vty.c \
                misc/lc15bts_mgr_nl.c \
                misc/lc15bts_mgr_temp.c \
                misc/lc15bts_mgr_calib.c \
                misc/lc15bts_led.c \
                misc/lc15bts_bts.c \
-               misc/lc15bts_swd.c
+               misc/lc15bts_swd.c \
+               $(NULL)

-lc15bts_mgr_LDADD = $(top_builddir)/src/common/libbts.a $(LIBGPS_LIBS) 
$(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOGSM_LIBS) 
$(LIBOSMOCTRL_LIBS) $(LIBSYSTEMD_LIBS) $(COMMON_LDADD)
+lc15bts_mgr_LDADD = \
+       $(top_builddir)/src/common/libbts.a \
+       $(COMMON_LDADD) \
+       $(LIBGPS_LIBS) \
+       $(NULL)

-lc15bts_util_SOURCES = misc/lc15bts_util.c misc/lc15bts_par.c
+lc15bts_util_SOURCES = \
+       misc/lc15bts_util.c \
+       misc/lc15bts_par.c ยบ
+       $(NULL)
 lc15bts_util_LDADD = $(LIBOSMOCORE_LIBS)
diff --git a/src/osmo-bts-oc2g/Makefile.am b/src/osmo-bts-oc2g/Makefile.am
index 7b18e88..9a5994e 100644
--- a/src/osmo-bts-oc2g/Makefile.am
+++ b/src/osmo-bts-oc2g/Makefile.am
@@ -1,38 +1,101 @@
-AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS = subdir-objects

 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(OC2G_INCDIR)
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) 
$(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) 
$(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) 
$(LIBGPS_CFLAGS) $(ORTP_CFLAGS) $(LIBSYSTEMD_CFLAGS)
-COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) 
$(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) 
$(ORTP_LIBS)
+
+AM_CFLAGS = \
+       -Wall \
+       $(LIBOSMOCORE_CFLAGS) \
+       $(LIBOSMOCODEC_CFLAGS) \
+       $(LIBOSMOGSM_CFLAGS) \
+       $(LIBOSMOVTY_CFLAGS) \
+       $(LIBOSMOTRAU_CFLAGS) \
+       $(LIBOSMOCTRL_CFLAGS) \
+       $(LIBOSMOABIS_CFLAGS) \
+       $(LIBGPS_CFLAGS) \
+       $(LIBSYSTEMD_CFLAGS) \
+       $(ORTP_CFLAGS) \
+       $(NULL)
+
+COMMON_LDADD = \
+       $(LIBOSMOCORE_LIBS) \
+       $(LIBOSMOCODEC_LIBS) \
+       $(LIBOSMOGSM_LIBS) \
+       $(LIBOSMOVTY_LIBS) \
+       $(LIBOSMOTRAU_LIBS) \
+       $(LIBOSMOCTRL_LIBS) \
+       $(LIBOSMOABIS_LIBS) \
+       $(ORTP_LIBS) \
+       $(NULL)

 AM_CFLAGS += -DENABLE_OC2GBTS

-EXTRA_DIST = misc/oc2gbts_mgr.h misc/oc2gbts_misc.h misc/oc2gbts_par.h 
misc/oc2gbts_led.h \
-       misc/oc2gbts_temp.h misc/oc2gbts_power.h misc/oc2gbts_clock.h \
-       misc/oc2gbts_bid.h misc/oc2gbts_bts.h misc/oc2gbts_nl.h 
misc/oc2gbts_swd.h \
-       hw_misc.h l1_if.h l1_transp.h oc2gbts.h utils.h
+EXTRA_DIST = \
+       misc/oc2gbts_mgr.h \
+       misc/oc2gbts_misc.h \
+       misc/oc2gbts_par.h \
+       misc/oc2gbts_led.h \
+       misc/oc2gbts_temp.h \
+       misc/oc2gbts_power.h \
+       misc/oc2gbts_clock.h \
+       misc/oc2gbts_bid.h \
+       misc/oc2gbts_bts.h \
+       misc/oc2gbts_nl.h \
+       misc/oc2gbts_swd.h \
+       hw_misc.h \
+       l1_if.h \
+       l1_transp.h \
+       oc2gbts.h \
+       utils.h \
+       $(NULL)

 bin_PROGRAMS = osmo-bts-oc2g oc2gbts-mgr oc2gbts-util

-COMMON_SOURCES = main.c oc2gbts.c l1_if.c oml.c oc2gbts_vty.c tch.c hw_misc.c 
calib_file.c \
-                utils.c misc/oc2gbts_par.c misc/oc2gbts_bid.c
+COMMON_SOURCES = \
+       main.c \
+       oc2gbts.c \
+       l1_if.c \
+       oml.c \
+       oc2gbts_vty.c \
+       tch.c \
+       hw_misc.c \
+       calib_file.c \
+       utils.c \
+       misc/oc2gbts_par.c \
+       misc/oc2gbts_bid.c \
+       $(NULL)

 osmo_bts_oc2g_SOURCES = $(COMMON_SOURCES) l1_transp_hw.c
-osmo_bts_oc2g_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD)
+osmo_bts_oc2g_LDADD = \
+       $(top_builddir)/src/common/libbts.a \
+       $(COMMON_LDADD) \
+       $(NULL)

 oc2gbts_mgr_SOURCES = \
-               misc/oc2gbts_mgr.c misc/oc2gbts_misc.c \
-               misc/oc2gbts_par.c misc/oc2gbts_nl.c \
-               misc/oc2gbts_temp.c misc/oc2gbts_power.c \
-               misc/oc2gbts_clock.c misc/oc2gbts_bid.c \
+               misc/oc2gbts_mgr.c \
+               misc/oc2gbts_misc.c \
+               misc/oc2gbts_par.c \
+               misc/oc2gbts_nl.c \
+               misc/oc2gbts_temp.c \
+               misc/oc2gbts_power.c \
+               misc/oc2gbts_clock.c \
+               misc/oc2gbts_bid.c \
                misc/oc2gbts_mgr_vty.c \
                misc/oc2gbts_mgr_nl.c \
                misc/oc2gbts_mgr_temp.c \
                misc/oc2gbts_mgr_calib.c \
                misc/oc2gbts_led.c \
                misc/oc2gbts_bts.c \
-               misc/oc2gbts_swd.c
+               misc/oc2gbts_swd.c \
+               $(NULL)

-oc2gbts_mgr_LDADD = $(top_builddir)/src/common/libbts.a $(LIBGPS_LIBS) 
$(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOGSM_LIBS) 
$(LIBOSMOCTRL_LIBS) $(LIBSYSTEMD_LIBS) $(COMMON_LDADD)
+oc2gbts_mgr_LDADD = \
+       $(top_builddir)/src/common/libbts.a \
+       $(COMMON_LDADD) \
+       $(LIBGPS_LIBS) \
+       $(NULL)

-oc2gbts_util_SOURCES = misc/oc2gbts_util.c misc/oc2gbts_par.c
+oc2gbts_util_SOURCES = \
+       misc/oc2gbts_util.c \
+       misc/oc2gbts_par.c \
+       $(NULL)
 oc2gbts_util_LDADD = $(LIBOSMOCORE_LIBS)
diff --git a/src/osmo-bts-octphy/Makefile.am b/src/osmo-bts-octphy/Makefile.am
index 43d9cd7..5904c5a 100644
--- a/src/osmo-bts-octphy/Makefile.am
+++ b/src/osmo-bts-octphy/Makefile.am
@@ -1,12 +1,40 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(OCTSDR2G_INCDIR)
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) 
$(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) 
$(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS)
-COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) 
$(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS)
+
+AM_CFLAGS = \
+       -Wall \
+       $(LIBOSMOCORE_CFLAGS) \
+       $(LIBOSMOCODEC_CFLAGS) \
+       $(LIBOSMOGSM_CFLAGS) \
+       $(LIBOSMOVTY_CFLAGS) \
+       $(LIBOSMOTRAU_CFLAGS) \
+       $(LIBOSMOCTRL_CFLAGS) \
+       $(LIBOSMOABIS_CFLAGS) \
+       $(NULL)
+
+COMMON_LDADD = \
+       $(LIBOSMOCORE_LIBS) \
+       $(LIBOSMOCODEC_LIBS) \
+       $(LIBOSMOGSM_LIBS) \
+       $(LIBOSMOVTY_LIBS) \
+       $(LIBOSMOTRAU_LIBS) \
+       $(LIBOSMOCTRL_LIBS) \
+       $(LIBOSMOABIS_LIBS) \
+       $(NULL)

 EXTRA_DIST = l1_if.h l1_oml.h l1_utils.h octphy_hw_api.h octpkt.h

 bin_PROGRAMS = osmo-bts-octphy

-COMMON_SOURCES = main.c l1_if.c l1_oml.c l1_utils.c l1_tch.c octphy_hw_api.c 
octphy_vty.c octpkt.c
+COMMON_SOURCES = \
+       main.c \
+       l1_if.c \
+       l1_oml.c \
+       l1_utils.c \
+       l1_tch.c \
+       octphy_hw_api.c \
+       octphy_vty.c \
+       octpkt.c \
+       $(NULL)

 osmo_bts_octphy_SOURCES = $(COMMON_SOURCES)
 osmo_bts_octphy_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD)
diff --git a/src/osmo-bts-omldummy/Makefile.am 
b/src/osmo-bts-omldummy/Makefile.am
index 5a4ce7c..97d5c2b 100644
--- a/src/osmo-bts-omldummy/Makefile.am
+++ b/src/osmo-bts-omldummy/Makefile.am
@@ -1,6 +1,25 @@
-AM_CFLAGS = -Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) 
$(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) 
$(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) 
$(LIBGPS_CFLAGS)
+AM_CFLAGS = \
+       -Wall -fno-strict-aliasing \
+       $(LIBOSMOCORE_CFLAGS) \
+       $(LIBOSMOGSM_CFLAGS) \
+       $(LIBOSMOVTY_CFLAGS) \
+       $(LIBOSMOTRAU_CFLAGS) \
+       $(LIBOSMOCTRL_CFLAGS) \
+       $(LIBOSMOABIS_CFLAGS) \
+       $(LIBGPS_CFLAGS) \
+       $(NULL)
+
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Iinclude
-COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) 
$(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) -ldl
+
+COMMON_LDADD = \
+       $(LIBOSMOCORE_LIBS) \
+       $(LIBOSMOGSM_LIBS) \
+       $(LIBOSMOVTY_LIBS) \
+       $(LIBOSMOTRAU_LIBS) \
+       $(LIBOSMOCTRL_LIBS) \
+       $(LIBOSMOABIS_LIBS) \
+       -ldl \
+       $(NULL)

 bin_PROGRAMS = osmo-bts-omldummy

diff --git a/src/osmo-bts-sysmo/Makefile.am b/src/osmo-bts-sysmo/Makefile.am
index 1faf122..281d17a 100644
--- a/src/osmo-bts-sysmo/Makefile.am
+++ b/src/osmo-bts-sysmo/Makefile.am
@@ -1,16 +1,61 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(SYSMOBTS_INCDIR)
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) 
$(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) 
$(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) 
$(LIBGPS_CFLAGS)
-COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) 
$(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS)
+AM_CFLAGS = \
+       -Wall \
+       $(LIBOSMOCORE_CFLAGS) \
+       $(LIBOSMOCODEC_CFLAGS) \
+       $(LIBOSMOGSM_CFLAGS) \
+       $(LIBOSMOVTY_CFLAGS) \
+       $(LIBOSMOTRAU_CFLAGS) \
+       $(LIBOSMOABIS_CFLAGS) \
+       $(LIBOSMOCTRL_CFLAGS) \
+       $(LIBOSMOABIS_CFLAGS) \
+       $(LIBGPS_CFLAGS) \
+       $(NULL)

-EXTRA_DIST = misc/sysmobts_mgr.h misc/sysmobts_misc.h misc/sysmobts_par.h \
-       misc/sysmobts_eeprom.h misc/sysmobts_nl.h femtobts.h hw_misc.h \
+COMMON_LDADD = \
+       $(LIBOSMOCORE_LIBS) \
+       $(LIBOSMOCODEC_LIBS) \
+       $(LIBOSMOGSM_LIBS) \
+       $(LIBOSMOVTY_LIBS) \
+       $(LIBOSMOTRAU_LIBS) \
+       $(LIBOSMOABIS_LIBS) \
+       $(LIBOSMOCTRL_LIBS) \
+       $(NULL)
+
+EXTRA_DIST = \
+       misc/sysmobts_mgr.h \
+       misc/sysmobts_misc.h \
+       misc/sysmobts_par.h \
+       misc/sysmobts_eeprom.h \
+       misc/sysmobts_nl.h \
        misc/sysmobts-layer1.h \
-       l1_fwd.h l1_if.h l1_transp.h eeprom.h utils.h
+       femtobts.h \
+       hw_misc.h \
+       l1_fwd.h \
+       l1_if.h \
+       l1_transp.h \
+       eeprom.h \
+       utils.h \
+       $(NULL)

 bin_PROGRAMS = osmo-bts-sysmo osmo-bts-sysmo-remote l1fwd-proxy sysmobts-mgr 
sysmobts-util

-COMMON_SOURCES = main.c femtobts.c l1_if.c oml.c sysmobts_vty.c tch.c 
hw_misc.c calib_file.c \
-                eeprom.c calib_fixup.c utils.c misc/sysmobts_par.c 
sysmobts_ctrl.c
+COMMON_SOURCES = \
+       main.c \
+       femtobts.c \
+       l1_if.c \
+       oml.c \
+       sysmobts_vty.c \
+       tch.c \
+       hw_misc.c \
+       calib_file.c \
+       eeprom.c \
+       calib_fixup.c \
+       utils.c \
+       misc/sysmobts_par.c \
+       sysmobts_ctrl.c \
+       $(NULL)
+

 osmo_bts_sysmo_SOURCES = $(COMMON_SOURCES) l1_transp_hw.c
 osmo_bts_sysmo_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD)
diff --git a/src/osmo-bts-virtual/Makefile.am b/src/osmo-bts-virtual/Makefile.am
index 070efed..50af2d3 100644
--- a/src/osmo-bts-virtual/Makefile.am
+++ b/src/osmo-bts-virtual/Makefile.am
@@ -1,10 +1,46 @@
-AM_CFLAGS = -Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) 
$(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) 
$(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) 
$(LIBGPS_CFLAGS)
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Iinclude
-COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) 
$(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) -ldl
+AM_CFLAGS = \
+       -Wall -fno-strict-aliasing \
+       $(LIBOSMOCORE_CFLAGS) \
+       $(LIBOSMOGSM_CFLAGS) \
+       $(LIBOSMOVTY_CFLAGS) \
+       $(LIBOSMOTRAU_CFLAGS) \
+       $(LIBOSMOCTRL_CFLAGS) \
+       $(LIBOSMOABIS_CFLAGS) \
+       $(LIBGPS_CFLAGS) \
+       $(NULL)

-noinst_HEADERS = l1_if.h osmo_mcast_sock.h virtual_um.h
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Iinclude
+
+COMMON_LDADD = \
+       $(LIBOSMOCORE_LIBS) \
+       $(LIBOSMOGSM_LIBS) \
+       $(LIBOSMOVTY_LIBS) \
+       $(LIBOSMOTRAU_LIBS) \
+       $(LIBOSMOCTRL_LIBS) \
+       $(LIBOSMOABIS_LIBS) \
+       -ldl \
+       $(NULL)
+
+noinst_HEADERS = \
+       l1_if.h \
+       osmo_mcast_sock.h \
+       virtual_um.h \
+       $(NULL)

 bin_PROGRAMS = osmo-bts-virtual

-osmo_bts_virtual_SOURCES = main.c bts_model.c virtualbts_vty.c 
scheduler_virtbts.c l1_if.c virtual_um.c osmo_mcast_sock.c
-osmo_bts_virtual_LDADD = $(top_builddir)/src/common/libl1sched.a 
$(top_builddir)/src/common/libbts.a $(COMMON_LDADD)
+osmo_bts_virtual_SOURCES = \
+       main.c \
+       bts_model.c \
+       virtualbts_vty.c \
+       scheduler_virtbts.c \
+       l1_if.c \
+       virtual_um.c \
+       osmo_mcast_sock.c \
+       $(NULL)
+
+osmo_bts_virtual_LDADD = \
+       $(top_builddir)/src/common/libl1sched.a \
+       $(top_builddir)/src/common/libbts.a \
+       $(COMMON_LDADD) \
+       $(NULL)

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I24ecfa1167b806dcb3a5a0c00343299df842a78b
Gerrit-Change-Number: 29031
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pes...@sysmocom.de>
Gerrit-MessageType: newchange

Reply via email to