paulmataruso/openbts
1
0
Fork 0
mirror of https://github.com/RangeNetworks/openbts.git synced 2025-11-03 21:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

changing config scripts to explitly target UHD/USRP1

Browse Source 
git-svn-id: http://wush.net/svn/range/software/public/openbts/trunk@2692 19bc5d8c-e614-43d4-8b26-e1612bc8e597
This commit is contained in:
Kurtis Heimerl
2011-11-26 03:19:36 +00:00
parent a0aa6c9206
commit 3afb9ecd93
3 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.am
View File

@@ -26,7 +26,7 @@ AM_CXXFLAGS = -Wall -pthread -ldl
#AM_CFLAGS = -Wall -O2 -NDEBUG -pthread -ldl
# Order must be preserved
SUBDIRS = \
_SUBDIRS = \
config \
AsteriskConfig \
sqlite3 \
@@ -38,13 +38,25 @@ SUBDIRS = \
GSM \
SMS \
TransceiverRAD1 \
Transceiver52M \
TRXManager \
Control \
apps \
doc \
tools
#if UHD or USRP1 defined, build Transceiver52M as well
if UHD
SUBDIRS = $(_SUBIRS) \
Transceiver52M
else
if USRP1
SUBDIRS = $(_SUBIRS) \
Transceiver52M
else
SUBDIRS = $(_SUBDIRS)
endif
endif
EXTRA_DIST = \
autogen.sh \
Transceiver52M \

12
Transceiver52M/Makefile.am
View File

@@ -21,10 +21,17 @@
include $(top_srcdir)/Makefile.common
#UHD wins if both are defined
if UHD
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(UHD_CFLAGS)
else
if USRP1
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(USRP_CFLAGS)
else
#we should never be here, as this doesn't build if one of the above
#doesn't exist
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES)
endif
endif
AM_CXXFLAGS = -ldl -lpthread
@@ -93,16 +100,21 @@ 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
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
endif

20
configure.ac
View File

@@ -62,6 +62,11 @@ AC_ARG_WITH(usrp1, [
[enable USRP1 gnuradio based transceiver])
])
AC_ARG_WITH(uhd, [
AS_HELP_STRING([--with-uhd],
[enable UHD based transceiver])
])
AC_ARG_WITH(singledb, [
AS_HELP_STRING([--with-singledb],
[enable single daughterboard use on USRP1])
@@ -90,8 +95,10 @@ AS_IF([test "x$with_usrp1" = "xyes"], [
if test "x$libusrp_3_3" = "xyes";then
AC_DEFINE(HAVE_LIBUSRP_3_3, 1, Define to 1 if you have libusrp >= 3.3)
fi
],
[PKG_CHECK_MODULES(UHD, uhd)
])
AS_IF([test "x$with_uhd" = "xyes"],[
PKG_CHECK_MODULES(UHD, uhd)
AC_DEFINE(USE_UHD, 1, Define to 1 if using UHD)
])
@@ -108,7 +115,8 @@ AS_IF([test "x$with_singledb" = "xyes"], [
])
AM_CONDITIONAL(RESAMPLE, [test "x$with_resamp" = "xyes"])
AM_CONDITIONAL(UHD, [test "x$with_usrp1" != "xyes"])
AM_CONDITIONAL(UHD, [test "x$with_uhd" = "xyes"])
AM_CONDITIONAL(USRP1, [test "x$with_usrp1" = "xyes"])
# Defines OSIP_CFLAGS, OSIP_INCLUDEDIR, and OSIP_LIBS
PKG_CHECK_MODULES(OSIP, libosip2)
@@ -122,7 +130,6 @@ PKG_CHECK_MODULES(LIBUSB, libusb-1.0)
# Prepends -lreadline to LIBS and defines HAVE_LIBREADLINE in config.h
#AC_CHECK_LIB(readline, readline)
dnl Output files
AC_CONFIG_FILES([\
Makefile \
@@ -138,11 +145,14 @@ AC_CONFIG_FILES([\
SIP/Makefile \
SMS/Makefile \
TransceiverRAD1/Makefile \
Transceiver52M/Makefile \
TRXManager/Makefile \
CLI/Makefile \
SR/Makefile \
sqlite3/Makefile \
])
AS_IF([test "x$with_usrp1" = "xyes" -o "x$with_uhd" = "xyes"],
[AC_CONFIG_FILES(Transceiver52M/Makefile)
])
AC_OUTPUT