diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-03-07 14:39:26 +0100 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-03-07 19:46:42 +0100 |
| commit | b35cba613ab2295ec99c897c9a80660ac2738491 (patch) | |
| tree | b39e1be6d01a1731b469e3e5c430aa83d1a49244 | |
| parent | 8dffadb8da92e7b0af97362936a117ebfbd9323d (diff) | |
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
| -rw-r--r-- | Transceiver52M/Makefile.am | 6 | ||||
| -rw-r--r-- | Transceiver52M/arm/Makefile.am | 2 | ||||
| -rw-r--r-- | Transceiver52M/x86/Makefile.am | 2 |
3 files changed, 5 insertions, 5 deletions
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 @@ 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 = 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 @@ libarch_la_SOURCES = \ 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 @@ libarch_la_SOURCES = \ ../common/convert_base.c \ convert.c \ convolve.c -endif |