aboutsummaryrefslogtreecommitdiffstats
path: root/Transceiver52M/Makefile.am
diff options
context:
space:
mode:
authorThomas Tsou <tom@tsou.cc>2013-10-30 21:24:40 -0400
committerThomas Tsou <tom@tsou.cc>2013-11-04 09:15:55 -0800
commit17bbb9b755b2b91c15114bc2dfb6f29fc7a66377 (patch)
tree90d90d343f54037ed5cd8472d63fb1f4c2a7f1e1 /Transceiver52M/Makefile.am
parenta1a3ab4babf591cf9c0d233d93b1188f747f5259 (diff)
Transceiver52M: Separate architecture specific files
Move x86 specific files into their own directory as this area is about to get crowded with the addition of ARM support. Signed-off-by: Thomas Tsou <tom@tsou.cc>
Diffstat (limited to 'Transceiver52M/Makefile.am')
-rw-r--r--Transceiver52M/Makefile.am17
1 files changed, 10 insertions, 7 deletions
diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index d002b04..c03116e 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -21,10 +21,13 @@
include $(top_srcdir)/Makefile.common
-AM_CFLAGS = $(STD_DEFINES_AND_INCLUDES) -std=gnu99 -march=native
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) -I./common
AM_CXXFLAGS = -ldl -lpthread
+SUBDIRS = x86
+
+ARCH_LA = x86/libarch.la
+
#UHD wins if both are defined
if UHD
AM_CPPFLAGS += $(UHD_CFLAGS)
@@ -52,9 +55,7 @@ COMMON_SOURCES = \
radioClock.cpp \
sigProcLib.cpp \
Transceiver.cpp \
- DummyLoad.cpp \
- convolve.c \
- convert.c
+ DummyLoad.cpp
libtransceiver_la_SOURCES = \
$(COMMON_SOURCES) \
@@ -79,8 +80,8 @@ noinst_HEADERS = \
rcvLPF_651.h \
sendLPF_961.h \
Resampler.h \
- convolve.h \
- convert.h
+ common/convolve.h \
+ common/convert.h
USRPping_SOURCES = USRPping.cpp
USRPping_LDADD = \
@@ -90,12 +91,14 @@ USRPping_LDADD = \
transceiver_SOURCES = runTransceiver.cpp
transceiver_LDADD = \
libtransceiver.la \
+ $(ARCH_LA) \
$(GSM_LA) \
$(COMMON_LA) $(SQLITE_LA)
sigProcLibTest_SOURCES = sigProcLibTest.cpp
sigProcLibTest_LDADD = \
libtransceiver.la \
+ $(ARCH_LA) \
$(GSM_LA) \
$(COMMON_LA) $(SQLITE_LA)