Move device specific files to device subdir
Change-Id: Ib42fef14bf4c7b779f44d99711a35c18b32a4c21
This commit is contained in:
parent
43fedb656b
commit
2128a308eb
|
@ -21,17 +21,11 @@
|
||||||
|
|
||||||
include $(top_srcdir)/Makefile.common
|
include $(top_srcdir)/Makefile.common
|
||||||
|
|
||||||
SUBDIRS = arch
|
SUBDIRS = arch device
|
||||||
|
|
||||||
AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/arch/common
|
AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/arch/common -I${srcdir}/device
|
||||||
AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
|
AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
|
||||||
|
|
||||||
if USRP1
|
|
||||||
AM_CPPFLAGS += $(USRP_CFLAGS)
|
|
||||||
else
|
|
||||||
AM_CPPFLAGS += $(UHD_CFLAGS)
|
|
||||||
endif
|
|
||||||
|
|
||||||
rev2dir = $(datadir)/usrp/rev2
|
rev2dir = $(datadir)/usrp/rev2
|
||||||
rev4dir = $(datadir)/usrp/rev4
|
rev4dir = $(datadir)/usrp/rev4
|
||||||
|
|
||||||
|
@ -42,7 +36,7 @@ EXTRA_DIST = \
|
||||||
README \
|
README \
|
||||||
README.Talgorithm
|
README.Talgorithm
|
||||||
|
|
||||||
noinst_LTLIBRARIES = libtransceiver.la
|
noinst_LTLIBRARIES = libtransceiver_common.la
|
||||||
|
|
||||||
COMMON_SOURCES = \
|
COMMON_SOURCES = \
|
||||||
radioInterface.cpp \
|
radioInterface.cpp \
|
||||||
|
@ -56,33 +50,28 @@ COMMON_SOURCES = \
|
||||||
Channelizer.cpp \
|
Channelizer.cpp \
|
||||||
Synthesis.cpp
|
Synthesis.cpp
|
||||||
|
|
||||||
libtransceiver_la_SOURCES = \
|
libtransceiver_common_la_SOURCES = \
|
||||||
$(COMMON_SOURCES) \
|
$(COMMON_SOURCES) \
|
||||||
Resampler.cpp \
|
Resampler.cpp \
|
||||||
radioInterfaceResamp.cpp \
|
radioInterfaceResamp.cpp \
|
||||||
radioInterfaceMulti.cpp
|
radioInterfaceMulti.cpp
|
||||||
|
|
||||||
bin_PROGRAMS = osmo-trx
|
|
||||||
|
|
||||||
noinst_HEADERS = \
|
noinst_HEADERS = \
|
||||||
Complex.h \
|
Complex.h \
|
||||||
radioInterface.h \
|
radioInterface.h \
|
||||||
radioVector.h \
|
radioVector.h \
|
||||||
radioClock.h \
|
radioClock.h \
|
||||||
radioDevice.h \
|
|
||||||
radioBuffer.h \
|
radioBuffer.h \
|
||||||
sigProcLib.h \
|
sigProcLib.h \
|
||||||
signalVector.h \
|
signalVector.h \
|
||||||
Transceiver.h \
|
Transceiver.h \
|
||||||
USRPDevice.h \
|
|
||||||
Resampler.h \
|
Resampler.h \
|
||||||
ChannelizerBase.h \
|
ChannelizerBase.h \
|
||||||
Channelizer.h \
|
Channelizer.h \
|
||||||
Synthesis.h
|
Synthesis.h
|
||||||
|
|
||||||
osmo_trx_SOURCES = osmo-trx.cpp
|
COMMON_LDADD = \
|
||||||
osmo_trx_LDADD = \
|
libtransceiver_common.la \
|
||||||
libtransceiver.la \
|
|
||||||
$(ARCH_LA) \
|
$(ARCH_LA) \
|
||||||
$(GSM_LA) \
|
$(GSM_LA) \
|
||||||
$(COMMON_LA) \
|
$(COMMON_LA) \
|
||||||
|
@ -91,10 +80,19 @@ osmo_trx_LDADD = \
|
||||||
$(LIBOSMOCTRL_LIBS) \
|
$(LIBOSMOCTRL_LIBS) \
|
||||||
$(LIBOSMOVTY_LIBS)
|
$(LIBOSMOVTY_LIBS)
|
||||||
|
|
||||||
|
bin_PROGRAMS = osmo-trx
|
||||||
|
osmo_trx_SOURCES = osmo-trx.cpp
|
||||||
|
|
||||||
if USRP1
|
if USRP1
|
||||||
libtransceiver_la_SOURCES += USRPDevice.cpp
|
osmo_trx_LDADD = \
|
||||||
osmo_trx_LDADD += $(USRP_LIBS)
|
$(COMMON_LDADD) \
|
||||||
|
$(USRP_LIBS) \
|
||||||
|
$(builddir)/device/usrp1/libdevice.la
|
||||||
|
osmo_trx_CPPFLAGS = $(AM_CPPFLAGS) $(USRP_CFLAGS)
|
||||||
else
|
else
|
||||||
libtransceiver_la_SOURCES += UHDDevice.cpp
|
osmo_trx_LDADD = \
|
||||||
osmo_trx_LDADD += $(UHD_LIBS)
|
$(COMMON_LDADD) \
|
||||||
|
$(UHD_LIBS) \
|
||||||
|
$(builddir)/device/uhd/libdevice.la
|
||||||
|
osmo_trx_CPPFLAGS = $(AM_CPPFLAGS) $(UHD_CFLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
include $(top_srcdir)/Makefile.common
|
||||||
|
|
||||||
|
noinst_HEADERS = radioDevice.h
|
||||||
|
|
||||||
|
SUBDIRS =
|
||||||
|
|
||||||
|
if USRP1
|
||||||
|
SUBDIRS += usrp1
|
||||||
|
else
|
||||||
|
SUBDIRS += uhd
|
||||||
|
endif
|
|
@ -0,0 +1,8 @@
|
||||||
|
include $(top_srcdir)/Makefile.common
|
||||||
|
|
||||||
|
AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/..
|
||||||
|
AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(UHD_CFLAGS)
|
||||||
|
|
||||||
|
noinst_LTLIBRARIES = libdevice.la
|
||||||
|
|
||||||
|
libdevice_la_SOURCES = UHDDevice.cpp
|
|
@ -0,0 +1,10 @@
|
||||||
|
include $(top_srcdir)/Makefile.common
|
||||||
|
|
||||||
|
AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/..
|
||||||
|
AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(USRP_CFLAGS)
|
||||||
|
|
||||||
|
noinst_HEADERS = USRPDevice.h
|
||||||
|
|
||||||
|
noinst_LTLIBRARIES = libdevice.la
|
||||||
|
|
||||||
|
libdevice_la_SOURCES = USRPDevice.cpp
|
|
@ -203,6 +203,9 @@ AC_CONFIG_FILES([\
|
||||||
Transceiver52M/arch/common/Makefile \
|
Transceiver52M/arch/common/Makefile \
|
||||||
Transceiver52M/arch/arm/Makefile \
|
Transceiver52M/arch/arm/Makefile \
|
||||||
Transceiver52M/arch/x86/Makefile \
|
Transceiver52M/arch/x86/Makefile \
|
||||||
|
Transceiver52M/device/Makefile \
|
||||||
|
Transceiver52M/device/uhd/Makefile \
|
||||||
|
Transceiver52M/device/usrp1/Makefile \
|
||||||
tests/Makefile \
|
tests/Makefile \
|
||||||
tests/CommonLibs/Makefile \
|
tests/CommonLibs/Makefile \
|
||||||
tests/Transceiver52M/Makefile \
|
tests/Transceiver52M/Makefile \
|
||||||
|
|
Loading…
Reference in New Issue