subject:"osmo\-trx\[master\]\: Build Transceiver52M\/common as an .la lib"

[MERGED] osmo-trx[master]: Build Transceiver52M/common as an .la lib

2018-03-13 Thread Harald Welte

Harald Welte has submitted this change and it was merged.

Change subject: Build Transceiver52M/common as an .la lib
..


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
---
M Transceiver52M/Makefile.am
M Transceiver52M/arm/Makefile.am
A Transceiver52M/common/Makefile.am
M Transceiver52M/x86/Makefile.am
M configure.ac
5 files changed, 24 insertions(+), 14 deletions(-)

Approvals:
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



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 @@
 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 @@
Transceiver.cpp \
ChannelizerBase.cpp \
Channelizer.cpp \
-   Synthesis.cpp \
-   common/fft.c
+   Synthesis.cpp
 
 libtransceiver_la_SOURCES = \
$(COMMON_SOURCES) \
@@ -83,12 +83,7 @@
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 @@
 
 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 000..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_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 @@
 endif
 
 libarch_la_SOURCES = \
-   ../common/convolve_base.c \
-   ../common/convert_base.c \
convert.c \
convolve.c
diff --git a/configure.ac b/configure.ac
index 916cf18..bade799 100644
--- a/configure.ac
+++ b/configure.ac
@@ -182,6 +182,7 @@
 CommonLibs/Makefile \
 GSM/Makefile \
 Transceiver52M/Makefile \
+Transceiver52M/common/Makefile \
 Transceiver52M/arm/Makefile \
 Transceiver52M/x86/Makefile \
 tests/Makefile \

-- 
To view, visit https://gerrit.osmocom.org/7148
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I81bb4251d18fce978d27849b621b20f541caab0b
Gerrit-PatchSet: 2
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy

osmo-trx[master]: Build Transceiver52M/common as an .la lib

2018-03-13 Thread Harald Welte


Patch Set 2: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7148
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I81bb4251d18fce978d27849b621b20f541caab0b
Gerrit-PatchSet: 2
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-HasComments: No

osmo-trx[master]: Build Transceiver52M/common as an .la lib

2018-03-08 Thread Vadim Yanitskiy


Patch Set 2: Code-Review+1

-- 
To view, visit https://gerrit.osmocom.org/7148
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I81bb4251d18fce978d27849b621b20f541caab0b
Gerrit-PatchSet: 2
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-HasComments: No

[PATCH] osmo-trx[master]: Build Transceiver52M/common as an .la lib

2018-03-08 Thread Pau Espin Pedrol

Hello Harald Welte,

I'd like you to reexamine a change.  Please visit

https://gerrit.osmocom.org/7148

to look at the new patch set (#2).

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
---
M Transceiver52M/Makefile.am
M Transceiver52M/arm/Makefile.am
A Transceiver52M/common/Makefile.am
M Transceiver52M/x86/Makefile.am
M configure.ac
5 files changed, 24 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/48/7148/2

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 @@
 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 @@
Transceiver.cpp \
ChannelizerBase.cpp \
Channelizer.cpp \
-   Synthesis.cpp \
-   common/fft.c
+   Synthesis.cpp
 
 libtransceiver_la_SOURCES = \
$(COMMON_SOURCES) \
@@ -83,12 +83,7 @@
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 @@
 
 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 000..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_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 @@
 endif
 
 libarch_la_SOURCES = \
-   ../common/convolve_base.c \
-   ../common/convert_base.c \
convert.c \
convolve.c
diff --git a/configure.ac b/configure.ac
index 916cf18..bade799 100644
--- a/configure.ac
+++ b/configure.ac
@@ -182,6 +182,7 @@
 CommonLibs/Makefile \
 GSM/Makefile \
 Transceiver52M/Makefile \
+Transceiver52M/common/Makefile \
 Transceiver52M/arm/Makefile \
 Transceiver52M/x86/Makefile \
 tests/Makefile \

-- 
To view, visit https://gerrit.osmocom.org/7148
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I81bb4251d18fce978d27849b621b20f541caab0b
Gerrit-PatchSet: 2
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy

osmo-trx[master]: Build Transceiver52M/common as an .la lib

2018-03-07 Thread Vadim Yanitskiy


Patch Set 1:

(3 comments)

In general, looks good.

Regarding to the $(top_builddir), this could be done
in a separate change...

https://gerrit.osmocom.org/#/c/7148/1/Transceiver52M/arm/Makefile.am
File Transceiver52M/arm/Makefile.am:

Line 12: libarch_la_LIBADD = ../common/libarch_common.la
Why not to use $(top_builddir) here?


https://gerrit.osmocom.org/#/c/7148/1/Transceiver52M/common/Makefile.am
File Transceiver52M/common/Makefile.am:

Line 4: libarch_common_la_LIBADD =
Probably, this var will remain empty for long time.
Do we really need this?


https://gerrit.osmocom.org/#/c/7148/1/Transceiver52M/x86/Makefile.am
File Transceiver52M/x86/Makefile.am:

Line 7: libarch_la_LIBADD = ../common/libarch_common.la
Also $(top_builddir)?


-- 
To view, visit https://gerrit.osmocom.org/7148
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I81bb4251d18fce978d27849b621b20f541caab0b
Gerrit-PatchSet: 1
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-HasComments: Yes

osmo-trx[master]: Build Transceiver52M/common as an .la lib

2018-03-07 Thread Harald Welte


Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7148
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I81bb4251d18fce978d27849b621b20f541caab0b
Gerrit-PatchSet: 1
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

[PATCH] osmo-trx[master]: Build Transceiver52M/common as an .la lib

2018-03-07 Thread Pau Espin Pedrol


Review at  https://gerrit.osmocom.org/7148

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
---
M Transceiver52M/Makefile.am
M Transceiver52M/arm/Makefile.am
A Transceiver52M/common/Makefile.am
M Transceiver52M/x86/Makefile.am
M configure.ac
5 files changed, 25 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/48/7148/1

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 @@
 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 @@
Transceiver.cpp \
ChannelizerBase.cpp \
Channelizer.cpp \
-   Synthesis.cpp \
-   common/fft.c
+   Synthesis.cpp
 
 libtransceiver_la_SOURCES = \
$(COMMON_SOURCES) \
@@ -83,12 +83,7 @@
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..11098c6 100644
--- a/Transceiver52M/arm/Makefile.am
+++ b/Transceiver52M/arm/Makefile.am
@@ -9,8 +9,9 @@
 
 noinst_LTLIBRARIES = libarch.la
 
+libarch_la_LIBADD = ../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 000..e8b8f44
--- /dev/null
+++ b/Transceiver52M/common/Makefile.am
@@ -0,0 +1,16 @@
+AM_CFLAGS = -Wall -std=gnu99
+
+noinst_LTLIBRARIES = libarch_common.la
+libarch_common_la_LIBADD =
+
+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..a87bd04 100644
--- a/Transceiver52M/x86/Makefile.am
+++ b/Transceiver52M/x86/Makefile.am
@@ -4,7 +4,7 @@
 noinst_LTLIBRARIES += libarch_sse_3.la
 noinst_LTLIBRARIES += libarch_sse_4_1.la
 
-libarch_la_LIBADD =
+libarch_la_LIBADD = ../common/libarch_common.la
 
 # SSE 3 specific code
 if HAVE_SSE3
@@ -24,7 +24,5 @@
 endif
 
 libarch_la_SOURCES = \
-   ../common/convolve_base.c \
-   ../common/convert_base.c \
convert.c \
convolve.c
diff --git a/configure.ac b/configure.ac
index 916cf18..bade799 100644
--- a/configure.ac
+++ b/configure.ac
@@ -182,6 +182,7 @@
 CommonLibs/Makefile \
 GSM/Makefile \
 Transceiver52M/Makefile \
+Transceiver52M/common/Makefile \
 Transceiver52M/arm/Makefile \
 Transceiver52M/x86/Makefile \
 tests/Makefile \

-- 
To view, visit https://gerrit.osmocom.org/7148
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81bb4251d18fce978d27849b621b20f541caab0b
Gerrit-PatchSet: 1
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol

[MERGED] osmo-trx[master]: Build Transceiver52M/common as an .la lib

osmo-trx[master]: Build Transceiver52M/common as an .la lib

osmo-trx[master]: Build Transceiver52M/common as an .la lib

[PATCH] osmo-trx[master]: Build Transceiver52M/common as an .la lib

osmo-trx[master]: Build Transceiver52M/common as an .la lib

osmo-trx[master]: Build Transceiver52M/common as an .la lib

[PATCH] osmo-trx[master]: Build Transceiver52M/common as an .la lib

7 matches

Site Navigation

Mail list logo

Footer information