diff options
| author | Thomas Tsou <tom@tsou.cc> | 2013-11-04 10:20:21 -0800 |
|---|---|---|
| committer | Thomas Tsou <tom@tsou.cc> | 2013-11-04 10:23:24 -0800 |
| commit | fffd987f221ff9fb89cf614bfd45309ccd9a3242 (patch) | |
| tree | fe3867bbf26b2e1aef5c72f08191fc90a1efd76b /Transceiver52M | |
| parent | 17bbb9b755b2b91c15114bc2dfb6f29fc7a66377 (diff) | |
build: Set UHD driver as default configuration
Currently the default configuration is to not build the full
transceiver, which is pointless. Set the UHD driver, which
includes either Ettus or Fairwaves variants, as the default.
Signed-off-by: Thomas Tsou <tom@tsou.cc>
Diffstat (limited to 'Transceiver52M')
| -rw-r--r-- | Transceiver52M/Makefile.am | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am index c03116e..15fe047 100644 --- a/Transceiver52M/Makefile.am +++ b/Transceiver52M/Makefile.am @@ -28,13 +28,10 @@ SUBDIRS = x86 ARCH_LA = x86/libarch.la -#UHD wins if both are defined -if UHD -AM_CPPFLAGS += $(UHD_CFLAGS) -else -if USRP1 +if USRP1 AM_CPPFLAGS += $(USRP_CFLAGS) -endif +else +AM_CPPFLAGS += $(UHD_CFLAGS) endif rev2dir = $(datadir)/usrp/rev2 @@ -102,29 +99,14 @@ sigProcLibTest_LDADD = \ $(GSM_LA) \ $(COMMON_LA) $(SQLITE_LA) -#uhd wins -if UHD -libtransceiver_la_SOURCES += UHDDevice.cpp -transceiver_LDADD += $(UHD_LIBS) -USRPping_LDADD += $(UHD_LIBS) -sigProcLibTest_LDADD += $(UHD_LIBS) -else -if USRP1 +if USRP1 libtransceiver_la_SOURCES += USRPDevice.cpp transceiver_LDADD += $(USRP_LIBS) USRPping_LDADD += $(USRP_LIBS) sigProcLibTest_LDADD += $(USRP_LIBS) else -#we should never be here, as one of the above mustbe defined for us to build -endif +libtransceiver_la_SOURCES += UHDDevice.cpp +transceiver_LDADD += $(UHD_LIBS) +USRPping_LDADD += $(UHD_LIBS) +sigProcLibTest_LDADD += $(UHD_LIBS) endif - - -MOSTLYCLEANFILES += - -#radioInterface.cpp -#ComplexTest.cpp -#sigProcLibTest.cpp -#sweepGenerator.cpp -#testRadio.cpp - |