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

cleaned up makefiles, and now can is confflags="--with-uhd" dpkg-buildpackage -B to build the uhd version. There's still an issue with linking uhd though, I have to test on a real install.

Browse Source 
git-svn-id: http://wush.net/svn/range/software/public/openbts/trunk@5904 19bc5d8c-e614-43d4-8b26-e1612bc8e597
This commit is contained in:
Kurtis Heimerl
2013-07-09 07:22:26 +00:00
parent 7466de849a
commit 2ada18a775
8 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
GSM/Makefile.am
View File

@@ -20,8 +20,8 @@
include $(top_srcdir)/Makefile.common
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES)
#AM_CXXFLAGS = -O2 -g
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(USB_INCLUDES) $(WITH_INCLUDES) $(OPENBTS_CPPFLAGS)
AM_CXXFLAGS = -Wall -pthread -ldl $(OPENBTS_CXXFLAGS)
noinst_LTLIBRARIES = libGSM.la

17
Makefile.am
View File

@@ -20,7 +20,7 @@
include $(top_srcdir)/Makefile.common
DESTDIR :=
DESTDIR =
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(USB_INCLUDES) $(WITH_INCLUDES)
AM_CXXFLAGS = -Wall -pthread -ldl
@@ -39,7 +39,6 @@ _SUBDIRS = \
SIP \
GSM \
SMS \
TransceiverRAD1 \
TRXManager \
Control \
apps \
@@ -50,18 +49,20 @@ _SUBDIRS = \
if UHD
SUBDIRS = $(_SUBDIRS) \
Transceiver52M
UHD = 1
else
if USRP1
SUBDIRS = $(_SUBDIRS) \
Transceiver52M
USRP1 = 1
else
SUBDIRS = $(_SUBDIRS)
SUBDIRS = $(_SUBDIRS) \
TransceiverRAD1
endif
endif
EXTRA_DIST = \
autogen.sh \
Transceiver52M \
INSTALLATION \
LEGAL \
COPYING \
@@ -69,7 +70,15 @@ EXTRA_DIST = \
install: all
$(MAKE) -C ./apps install
if UHD
$(MAKE) -C ./Transceiver52M install
else
if USRP1
$(MAKE) -C ./Transceiver52M install
else
$(MAKE) -C ./TransceiverRAD1 install
endif
endif
dox: FORCE
doxygen doxconfig

3
Makefile.common
View File

@@ -22,9 +22,6 @@
top_srcdir = $(abs_top_srcdir)
top_builddir = $(abs_top_builddir)
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(USB_INCLUDES) $(WITH_INCLUDES) $(OPENBTS_CPPFLAGS)
AM_CXXFLAGS = -Wall -pthread -ldl $(OPENBTS_CXXFLAGS)
COMMON_INCLUDEDIR = $(top_srcdir)/CommonLibs
CONTROL_INCLUDEDIR = $(top_srcdir)/Control
GSM_INCLUDEDIR = $(top_srcdir)/GSM

5
Transceiver52M/Makefile.am
View File

@@ -21,6 +21,8 @@
include $(top_srcdir)/Makefile.common
DESTDIR =
#UHD wins if both are defined
if UHD
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(UHD_CFLAGS)
@@ -117,6 +119,9 @@ else
endif
endif
install: transceiver
@mkdir -p "$(DESTDIR)/OpenBTS/"
install transceiver "$(DESTDIR)/OpenBTS/"
MOSTLYCLEANFILES +=

2
TransceiverRAD1/Makefile.am
View File

@@ -20,7 +20,7 @@
include $(top_srcdir)/Makefile.common
DESTDIR :=
DESTDIR =
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(USB_INCLUDES) $(WITH_INCLUDES)
AM_CXXFLAGS = -DOMNITHREAD_POSIX=1 -lusb-1.0 -ldl -lpthread

7
apps/Makefile.am
View File

@@ -21,11 +21,10 @@
include $(top_srcdir)/Makefile.common
DESTDIR :=
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(USB_INCLUDES) $(WITH_INCLUDES) $(OPENBTS_CPPFLAGS)
AM_CXXFLAGS = -Wall -pthread -ldl $(OPENBTS_CXXFLAGS)
# These variables are defined in ../Makefile.common
# AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES)
# AM_CXXFLAGS = -Wall -ldl -pthread
DESTDIR =
noinst_PROGRAMS = \
OpenBTS \

4
debian/control vendored
View File

@@ -3,7 +3,7 @@ Section: comm
Priority: optional
Maintainer: Range Networks, Inc. <info@rangenetworks.com>
Homepage: http://www.rangenetworks.com/
Build-Depends: build-essential, debhelper (>= 7), libosip2-dev, pkg-config, autoconf
Build-Depends: build-essential, debhelper (>= 7), libosip2-dev, pkg-config, autoconf, uhd
Standards-Version: 3.7.3
Package: openbts-public
@@ -12,5 +12,5 @@ Section: comm
Priority: optional
Architecture: any
Essential: no
Depends: sqlite3, libosip2-4, libusb-1.0-0, libortp8, libglib2.0-0, libgl1-mesa-glx, libc6, libasound2, pkg-config, libpcre3, gawk, sipauthserve-public
Depends: sqlite3, libosip2-4, libusb-1.0-0, libortp8, libglib2.0-0, libgl1-mesa-glx, libc6, libasound2, pkg-config, libpcre3, gawk, sipauthserve-public, uhd
Description: OpenBTS Public Release.

2
debian/rules vendored
View File

@@ -108,7 +108,7 @@ binary-common:
# dh_perl
dh_makeshlibs
dh_installdeb
dh_shlibdeps
dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
dh_gencontrol
dh_md5sums
dh_builddeb