[PATCH] osmo-trx[master]: Makefile.am: Avoid using subdir if arch is not required

2018-03-07 Thread Pau Espin Pedrol 

Makefile.am: Avoid using subdir if arch is not required

There's no need in going a level deeper if we already know nothing's
going to be done. This way we also get cleaner make outputs.

Reference: 
https://www.gnu.org/software/automake/manual/html_node/Conditional-Subdirectories.html#Conditional-Subdirectories

Related: OS#3029

Change-Id: I3ff57ab14edc575904e8137929a0ef02c95e03af
---
M Transceiver52M/Makefile.am
M Transceiver52M/arm/Makefile.am
M Transceiver52M/x86/Makefile.am
3 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/46/7146/3

diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index 3c1b86c..187a335 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -24,7 +24,11 @@
 AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/common
 AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) 
$(LIBOSMOVTY_CFLAGS)
 
-SUBDIRS = arm x86
+if ARCH_ARM
+SUBDIRS = arm
+else
+SUBDIRS = x86
+endif
 
 if USRP1
 AM_CPPFLAGS += $(USRP_CFLAGS)
diff --git a/Transceiver52M/arm/Makefile.am b/Transceiver52M/arm/Makefile.am
index 0b959be..6b0b992 100644
--- a/Transceiver52M/arm/Makefile.am
+++ b/Transceiver52M/arm/Makefile.am
@@ -1,4 +1,3 @@
-if ARCH_ARM
 if ARCH_ARM_A15
 ARCH_FLAGS = -mfpu=neon-vfpv4
 else
@@ -20,4 +19,3 @@
scale_neon.S \
mult.c \
mult_neon.S
-endif
diff --git a/Transceiver52M/x86/Makefile.am b/Transceiver52M/x86/Makefile.am
index 45aa629..5d84f85 100644
--- a/Transceiver52M/x86/Makefile.am
+++ b/Transceiver52M/x86/Makefile.am
@@ -1,4 +1,3 @@
-if !ARCH_ARM
 AM_CFLAGS = -Wall -std=gnu99 -I${srcdir}/../common
 
 noinst_LTLIBRARIES = libarch.la
@@ -29,4 +28,3 @@
../common/convert_base.c \
convert.c \
convolve.c
-endif

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

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I3ff57ab14edc575904e8137929a0ef02c95e03af
Gerrit-PatchSet: 3
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol

[PATCH] osmo-trx[master]: Makefile.am: Avoid using subdir if arch is not required

2018-03-07 Thread Pau Espin Pedrol 

Makefile.am: Avoid using subdir if arch is not required

There's no need in going a level deeper if we already know nothing's
going to be done. This way we also get cleaner make outputs.

Related: OS#3029

Change-Id: I3ff57ab14edc575904e8137929a0ef02c95e03af
---
M Transceiver52M/Makefile.am
M Transceiver52M/arm/Makefile.am
M Transceiver52M/x86/Makefile.am
M configure.ac
4 files changed, 10 insertions(+), 7 deletions(-)


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

diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index 3c1b86c..187a335 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -24,7 +24,11 @@
 AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/common
 AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) 
$(LIBOSMOVTY_CFLAGS)
 
-SUBDIRS = arm x86
+if ARCH_ARM
+SUBDIRS = arm
+else
+SUBDIRS = x86
+endif
 
 if USRP1
 AM_CPPFLAGS += $(USRP_CFLAGS)
diff --git a/Transceiver52M/arm/Makefile.am b/Transceiver52M/arm/Makefile.am
index 0b959be..6b0b992 100644
--- a/Transceiver52M/arm/Makefile.am
+++ b/Transceiver52M/arm/Makefile.am
@@ -1,4 +1,3 @@
-if ARCH_ARM
 if ARCH_ARM_A15
 ARCH_FLAGS = -mfpu=neon-vfpv4
 else
@@ -20,4 +19,3 @@
scale_neon.S \
mult.c \
mult_neon.S
-endif
diff --git a/Transceiver52M/x86/Makefile.am b/Transceiver52M/x86/Makefile.am
index 45aa629..5d84f85 100644
--- a/Transceiver52M/x86/Makefile.am
+++ b/Transceiver52M/x86/Makefile.am
@@ -1,4 +1,3 @@
-if !ARCH_ARM
 AM_CFLAGS = -Wall -std=gnu99 -I${srcdir}/../common
 
 noinst_LTLIBRARIES = libarch.la
@@ -29,4 +28,3 @@
../common/convert_base.c \
convert.c \
convolve.c
-endif
diff --git a/configure.ac b/configure.ac
index 916cf18..ada8cfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -182,11 +182,14 @@
 CommonLibs/Makefile \
 GSM/Makefile \
 Transceiver52M/Makefile \
-Transceiver52M/arm/Makefile \
-Transceiver52M/x86/Makefile \
 tests/Makefile \
 tests/CommonLibs/Makefile \
 tests/Transceiver52M/Makefile \
 ])
 
+AM_COND_IF([ARCH_ARM],
+   [AC_CONFIG_FILES([Transceiver52M/arm/Makefile])],
+  [AC_CONFIG_FILES([Transceiver52M/x86/Makefile])])
+
+
 AC_OUTPUT

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

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I3ff57ab14edc575904e8137929a0ef02c95e03af
Gerrit-PatchSet: 2
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder

[PATCH] osmo-trx[master]: Makefile.am: Avoid using subdir if arch is not required

2018-03-07 Thread Pau Espin Pedrol 

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

Makefile.am: Avoid using subdir if arch is not required

There's no need in going a level deeper if we already know nothing's
going to be done. This way we also get cleaner make outputs.

Change-Id: I3ff57ab14edc575904e8137929a0ef02c95e03af
---
M Transceiver52M/Makefile.am
M Transceiver52M/arm/Makefile.am
M Transceiver52M/x86/Makefile.am
M configure.ac
4 files changed, 10 insertions(+), 7 deletions(-)


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

diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index 3c1b86c..187a335 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -24,7 +24,11 @@
 AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/common
 AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) 
$(LIBOSMOVTY_CFLAGS)
 
-SUBDIRS = arm x86
+if ARCH_ARM
+SUBDIRS = arm
+else
+SUBDIRS = x86
+endif
 
 if USRP1
 AM_CPPFLAGS += $(USRP_CFLAGS)
diff --git a/Transceiver52M/arm/Makefile.am b/Transceiver52M/arm/Makefile.am
index 0b959be..6b0b992 100644
--- a/Transceiver52M/arm/Makefile.am
+++ b/Transceiver52M/arm/Makefile.am
@@ -1,4 +1,3 @@
-if ARCH_ARM
 if ARCH_ARM_A15
 ARCH_FLAGS = -mfpu=neon-vfpv4
 else
@@ -20,4 +19,3 @@
scale_neon.S \
mult.c \
mult_neon.S
-endif
diff --git a/Transceiver52M/x86/Makefile.am b/Transceiver52M/x86/Makefile.am
index 45aa629..5d84f85 100644
--- a/Transceiver52M/x86/Makefile.am
+++ b/Transceiver52M/x86/Makefile.am
@@ -1,4 +1,3 @@
-if !ARCH_ARM
 AM_CFLAGS = -Wall -std=gnu99 -I${srcdir}/../common
 
 noinst_LTLIBRARIES = libarch.la
@@ -29,4 +28,3 @@
../common/convert_base.c \
convert.c \
convolve.c
-endif
diff --git a/configure.ac b/configure.ac
index 916cf18..ada8cfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -182,11 +182,14 @@
 CommonLibs/Makefile \
 GSM/Makefile \
 Transceiver52M/Makefile \
-Transceiver52M/arm/Makefile \
-Transceiver52M/x86/Makefile \
 tests/Makefile \
 tests/CommonLibs/Makefile \
 tests/Transceiver52M/Makefile \
 ])
 
+AM_COND_IF([ARCH_ARM],
+   [AC_CONFIG_FILES([Transceiver52M/arm/Makefile])],
+  [AC_CONFIG_FILES([Transceiver52M/x86/Makefile])])
+
+
 AC_OUTPUT

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

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