diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-03-07 20:21:06 +0100 |
---|---|---|
committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-03-08 14:53:13 +0100 |
commit | 8fbbd656c76eecff1a99432f6f54272c3884bc84 (patch) | |
tree | 4cee0973f8782cbd4247823d4bcf53c89398929d /Transceiver52M | |
parent | b35cba613ab2295ec99c897c9a80660ac2738491 (diff) |
Build Transceiver52M/common as an .la lib
Stop picking files from that directory on different places as it causes
dependency issues during make distclean/maintainer-clean.
Fixes: OS#3029
Change-Id: I81bb4251d18fce978d27849b621b20f541caab0b
Diffstat (limited to 'Transceiver52M')
-rw-r--r-- | Transceiver52M/Makefile.am | 15 | ||||
-rw-r--r-- | Transceiver52M/arm/Makefile.am | 3 | ||||
-rw-r--r-- | Transceiver52M/common/Makefile.am | 15 | ||||
-rw-r--r-- | Transceiver52M/x86/Makefile.am | 4 |
4 files changed, 23 insertions, 14 deletions
diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am index 187a335..9424b8e 100644 --- a/Transceiver52M/Makefile.am +++ b/Transceiver52M/Makefile.am @@ -24,10 +24,11 @@ include $(top_srcdir)/Makefile.common AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/common AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) +SUBDIRS = common if ARCH_ARM -SUBDIRS = arm +SUBDIRS += arm else -SUBDIRS = x86 +SUBDIRS += x86 endif if USRP1 @@ -58,8 +59,7 @@ COMMON_SOURCES = \ Transceiver.cpp \ ChannelizerBase.cpp \ Channelizer.cpp \ - Synthesis.cpp \ - common/fft.c + Synthesis.cpp libtransceiver_la_SOURCES = \ $(COMMON_SOURCES) \ @@ -83,12 +83,7 @@ noinst_HEADERS = \ Resampler.h \ ChannelizerBase.h \ Channelizer.h \ - Synthesis.h \ - common/convolve.h \ - common/convert.h \ - common/scale.h \ - common/mult.h \ - common/fft.h + Synthesis.h osmo_trx_SOURCES = osmo-trx.cpp osmo_trx_LDADD = \ diff --git a/Transceiver52M/arm/Makefile.am b/Transceiver52M/arm/Makefile.am index 6b0b992..5e423d0 100644 --- a/Transceiver52M/arm/Makefile.am +++ b/Transceiver52M/arm/Makefile.am @@ -9,8 +9,9 @@ AM_CCASFLAGS = $(ARCH_FLAGS) noinst_LTLIBRARIES = libarch.la +libarch_la_LIBADD = $(top_builddir)/Transceiver52M/common/libarch_common.la + libarch_la_SOURCES = \ - ../common/convolve_base.c \ convert.c \ convert_neon.S \ convolve.c \ diff --git a/Transceiver52M/common/Makefile.am b/Transceiver52M/common/Makefile.am new file mode 100644 index 0000000..6b37906 --- /dev/null +++ b/Transceiver52M/common/Makefile.am @@ -0,0 +1,15 @@ +AM_CFLAGS = -Wall -std=gnu99 + +noinst_LTLIBRARIES = libarch_common.la + +noinst_HEADERS = \ + convolve.h \ + convert.h \ + scale.h \ + mult.h \ + fft.h + +libarch_common_la_SOURCES = \ + convolve_base.c \ + convert_base.c \ + fft.c diff --git a/Transceiver52M/x86/Makefile.am b/Transceiver52M/x86/Makefile.am index 5d84f85..76c0bd2 100644 --- a/Transceiver52M/x86/Makefile.am +++ b/Transceiver52M/x86/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libarch.la noinst_LTLIBRARIES += libarch_sse_3.la noinst_LTLIBRARIES += libarch_sse_4_1.la -libarch_la_LIBADD = +libarch_la_LIBADD = $(top_builddir)/Transceiver52M/common/libarch_common.la # SSE 3 specific code if HAVE_SSE3 @@ -24,7 +24,5 @@ libarch_la_LIBADD += libarch_sse_4_1.la endif libarch_la_SOURCES = \ - ../common/convolve_base.c \ - ../common/convert_base.c \ convert.c \ convolve.c |