[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r6320 - in gnuradio/branches/developers/eb/usrp-la: .
|
From: |
eb |
|
Subject: |
[Commit-gnuradio] r6320 - in gnuradio/branches/developers/eb/usrp-la: . config usrp/host usrp/host/apps usrp/host/apps-inband usrp/host/lib/inband |
|
Date: |
Wed, 5 Sep 2007 14:06:38 -0600 (MDT) |
Author: eb
Date: 2007-09-05 14:06:38 -0600 (Wed, 05 Sep 2007)
New Revision: 6320
Added:
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/
Removed:
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/burn-db-eeprom
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/burn-serial-number
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/check_order
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/check_order_quickly.cc
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/dump_12bit_shorts
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/dump_shorts
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/run
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/run2
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/run_input
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/test_usrp_standard_rx.cc
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/test_usrp_standard_tx.cc
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/usrp_cal_dc_offset.cc
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/usrper.cc
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/read_packets.cc
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/test_usrp_inband_cs.cc
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/test_usrp_inband_ping.cc
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/test_usrp_inband_registers.cc
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/test_usrp_inband_rx.cc
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/test_usrp_inband_timestamps.cc
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/test_usrp_inband_tx.cc
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/ui_nco.h
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/ui_sincos.c
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/ui_sincos.h
Modified:
gnuradio/branches/developers/eb/usrp-la/Makefile.common
gnuradio/branches/developers/eb/usrp-la/config/grc_usrp.m4
gnuradio/branches/developers/eb/usrp-la/usrp/host/Makefile.am
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/Makefile.am
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/Makefile.am
gnuradio/branches/developers/eb/usrp-la/usrp/host/lib/inband/Makefile.am
Log:
Removed dependency on usrp-inband introduced in [6307].
Also moved part of usrp/host/apps into usrp/host/apps-inband to make
it easier to remove the inband stuff when creating the 3.1 release branch.
Modified: gnuradio/branches/developers/eb/usrp-la/Makefile.common
===================================================================
--- gnuradio/branches/developers/eb/usrp-la/Makefile.common 2007-09-05
19:14:11 UTC (rev 6319)
+++ gnuradio/branches/developers/eb/usrp-la/Makefile.common 2007-09-05
20:06:38 UTC (rev 6320)
@@ -74,12 +74,13 @@
# How to link in the USRP library from inside the tree
USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib/legacy \
- -I$(top_srcdir)/usrp/host/lib/inband \
-I$(top_srcdir)/usrp/firmware/include
-USRP_LA = \
- $(top_builddir)/usrp/host/lib/legacy/libusrp.la \
- $(top_builddir)/usrp/host/lib/inband/libusrp_inband.la
+USRP_LA = $(top_builddir)/usrp/host/lib/legacy/libusrp.la
+# How to link in usrp-inband library from inside the tree
+USRP_INBAND_INCLUDES = -I$(top_srcdir)/usrp/host/lib/inband
+USRP_INBAND_LA = $(top_builddir)/usrp/host/lib/inband/libusrp_inband.la
+
# How to link the PMT library from inside the tree
PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib
PMT_LA = $(top_builddir)/pmt/src/lib/libpmt.la
Modified: gnuradio/branches/developers/eb/usrp-la/config/grc_usrp.m4
===================================================================
--- gnuradio/branches/developers/eb/usrp-la/config/grc_usrp.m4 2007-09-05
19:14:11 UTC (rev 6319)
+++ gnuradio/branches/developers/eb/usrp-la/config/grc_usrp.m4 2007-09-05
20:06:38 UTC (rev 6320)
@@ -36,6 +36,7 @@
usrp/host/lib/legacy/std_paths.h \
usrp/host/swig/Makefile \
usrp/host/apps/Makefile \
+ usrp/host/apps-inband/Makefile \
usrp/firmware/Makefile \
usrp/firmware/include/Makefile \
usrp/firmware/lib/Makefile \
Modified: gnuradio/branches/developers/eb/usrp-la/usrp/host/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/usrp-la/usrp/host/Makefile.am
2007-09-05 19:14:11 UTC (rev 6319)
+++ gnuradio/branches/developers/eb/usrp-la/usrp/host/Makefile.am
2007-09-05 20:06:38 UTC (rev 6320)
@@ -1,5 +1,5 @@
#
-# Copyright 2001 Free Software Foundation, Inc.
+# Copyright 2001,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -19,5 +19,5 @@
# Boston, MA 02110-1301, USA.
#
-SUBDIRS = misc lib swig apps
+SUBDIRS = misc lib swig apps apps-inband
Modified: gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/Makefile.am
2007-09-05 19:14:11 UTC (rev 6319)
+++ gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/Makefile.am
2007-09-05 20:06:38 UTC (rev 6320)
@@ -21,9 +21,7 @@
include $(top_srcdir)/Makefile.common
-INCLUDES = \
- $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
- $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES)
+INCLUDES = $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES)
bin_PROGRAMS = \
@@ -32,20 +30,11 @@
noinst_PROGRAMS = \
check_order_quickly \
- test_usrp_inband_cs \
- test_usrp_inband_ping \
- test_usrp_inband_registers \
- test_usrp_inband_rx \
- test_usrp_inband_tx \
- test_usrp_inband_timestamps \
test_usrp_standard_rx \
- test_usrp_standard_tx \
- read_packets
+ test_usrp_standard_tx
noinst_HEADERS = \
- time_stuff.h \
- ui_nco.h \
- ui_sincos.h
+ time_stuff.h
noinst_PYTHON = \
burn-db-eeprom \
@@ -65,24 +54,3 @@
usrp_cal_dc_offset_SOURCES = usrp_cal_dc_offset.cc
usrp_cal_dc_offset_LDADD = $(USRP_LA)
-
-test_usrp_inband_cs_SOURCES = test_usrp_inband_cs.cc time_stuff.c
ui_sincos.c
-test_usrp_inband_cs_LDADD = $(USRP_LA)
-
-test_usrp_inband_ping_SOURCES = test_usrp_inband_ping.cc time_stuff.c
-test_usrp_inband_ping_LDADD = $(USRP_LA)
-
-test_usrp_inband_tx_SOURCES = test_usrp_inband_tx.cc time_stuff.c
ui_sincos.c
-test_usrp_inband_tx_LDADD = $(USRP_LA)
-
-test_usrp_inband_timestamps_SOURCES = test_usrp_inband_timestamps.cc
time_stuff.c ui_sincos.c
-test_usrp_inband_timestamps_LDADD = $(USRP_LA)
-
-test_usrp_inband_registers_SOURCES = test_usrp_inband_registers.cc
time_stuff.c ui_sincos.c
-test_usrp_inband_registers_LDADD = $(USRP_LA)
-
-test_usrp_inband_rx_SOURCES = test_usrp_inband_rx.cc time_stuff.c
ui_sincos.c
-test_usrp_inband_rx_LDADD = $(USRP_LA)
-
-read_packets_SOURCES = read_packets.cc
-read_packets_LDADD = $(USRP_LA)
Deleted: gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/read_packets.cc
Deleted:
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/test_usrp_inband_cs.cc
Deleted:
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/test_usrp_inband_ping.cc
Deleted:
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/test_usrp_inband_registers.cc
Deleted:
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/test_usrp_inband_rx.cc
Deleted:
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/test_usrp_inband_timestamps.cc
Deleted:
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/test_usrp_inband_tx.cc
Deleted: gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/ui_nco.h
Deleted: gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/ui_sincos.c
Deleted: gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/ui_sincos.h
Copied: gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband (from rev
6317, gnuradio/branches/developers/eb/usrp-la/usrp/host/apps)
Modified:
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/usrp-la/usrp/host/apps/Makefile.am
2007-09-05 17:32:13 UTC (rev 6317)
+++ gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/Makefile.am
2007-09-05 20:06:38 UTC (rev 6320)
@@ -23,66 +23,42 @@
INCLUDES = \
$(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
- $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES)
+ $(USRP_INCLUDES) $(USRP_INBAND_INCLUDES) $(BOOST_CFLAGS)
$(CPPUNIT_INCLUDES)
-bin_PROGRAMS = \
- usrper \
- usrp_cal_dc_offset
+bin_PROGRAMS =
noinst_PROGRAMS = \
- check_order_quickly \
test_usrp_inband_cs \
test_usrp_inband_ping \
test_usrp_inband_registers \
test_usrp_inband_rx \
test_usrp_inband_tx \
test_usrp_inband_timestamps \
- test_usrp_standard_rx \
- test_usrp_standard_tx \
read_packets
noinst_HEADERS = \
- time_stuff.h \
ui_nco.h \
ui_sincos.h
-noinst_PYTHON = \
- burn-db-eeprom \
- burn-serial-number
+test_usrp_inband_cs_SOURCES = test_usrp_inband_cs.cc ui_sincos.c
+test_usrp_inband_cs_LDADD = $(USRP_LA) $(USRP_INBAND_LA)
-check_order_quickly_SOURCES = check_order_quickly.cc
+test_usrp_inband_ping_SOURCES = test_usrp_inband_ping.cc
+test_usrp_inband_ping_LDADD = $(USRP_LA) $(USRP_INBAND_LA)
-test_usrp_standard_rx_SOURCES = test_usrp_standard_rx.cc time_stuff.c
-test_usrp_standard_rx_LDADD = $(USRP_LA)
+test_usrp_inband_tx_SOURCES = test_usrp_inband_tx.cc ui_sincos.c
+test_usrp_inband_tx_LDADD = $(USRP_LA) $(USRP_INBAND_LA)
-test_usrp_standard_tx_SOURCES = test_usrp_standard_tx.cc time_stuff.c
-test_usrp_standard_tx_LDADD = $(USRP_LA)
+test_usrp_inband_timestamps_SOURCES = test_usrp_inband_timestamps.cc
ui_sincos.c
+test_usrp_inband_timestamps_LDADD = $(USRP_LA) $(USRP_INBAND_LA)
-usrper_SOURCES = usrper.cc
-usrper_LDADD = $(USRP_LA)
+test_usrp_inband_registers_SOURCES = test_usrp_inband_registers.cc
ui_sincos.c
+test_usrp_inband_registers_LDADD = $(USRP_LA) $(USRP_INBAND_LA)
-usrp_cal_dc_offset_SOURCES = usrp_cal_dc_offset.cc
-usrp_cal_dc_offset_LDADD = $(USRP_LA)
+test_usrp_inband_rx_SOURCES = test_usrp_inband_rx.cc ui_sincos.c
+test_usrp_inband_rx_LDADD = $(USRP_LA) $(USRP_INBAND_LA)
-test_usrp_inband_cs_SOURCES = test_usrp_inband_cs.cc time_stuff.c
ui_sincos.c
-test_usrp_inband_cs_LDADD = $(USRP_LA)
-
-test_usrp_inband_ping_SOURCES = test_usrp_inband_ping.cc time_stuff.c
-test_usrp_inband_ping_LDADD = $(USRP_LA)
-
-test_usrp_inband_tx_SOURCES = test_usrp_inband_tx.cc time_stuff.c
ui_sincos.c
-test_usrp_inband_tx_LDADD = $(USRP_LA)
-
-test_usrp_inband_timestamps_SOURCES = test_usrp_inband_timestamps.cc
time_stuff.c ui_sincos.c
-test_usrp_inband_timestamps_LDADD = $(USRP_LA)
-
-test_usrp_inband_registers_SOURCES = test_usrp_inband_registers.cc
time_stuff.c ui_sincos.c
-test_usrp_inband_registers_LDADD = $(USRP_LA)
-
-test_usrp_inband_rx_SOURCES = test_usrp_inband_rx.cc time_stuff.c
ui_sincos.c
-test_usrp_inband_rx_LDADD = $(USRP_LA)
-
read_packets_SOURCES = read_packets.cc
-read_packets_LDADD = $(USRP_LA)
+read_packets_LDADD = $(USRP_LA) $(USRP_INBAND_LA)
Deleted:
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/burn-db-eeprom
Deleted:
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/burn-serial-number
Deleted:
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/check_order
Deleted:
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/check_order_quickly.cc
Deleted:
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/dump_12bit_shorts
Deleted:
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/dump_shorts
Deleted: gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/run
Deleted: gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/run2
Deleted: gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/run_input
Deleted:
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/test_usrp_standard_rx.cc
Deleted:
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/test_usrp_standard_tx.cc
Deleted:
gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/usrp_cal_dc_offset.cc
Deleted: gnuradio/branches/developers/eb/usrp-la/usrp/host/apps-inband/usrper.cc
Modified:
gnuradio/branches/developers/eb/usrp-la/usrp/host/lib/inband/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/usrp-la/usrp/host/lib/inband/Makefile.am
2007-09-05 19:14:11 UTC (rev 6319)
+++ gnuradio/branches/developers/eb/usrp-la/usrp/host/lib/inband/Makefile.am
2007-09-05 20:06:38 UTC (rev 6320)
@@ -23,7 +23,7 @@
INCLUDES = \
$(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
$(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) \
- -I$(srcdir)/../../apps
+ -I$(srcdir)/../../apps-inband
TESTS = test_inband
@@ -52,7 +52,7 @@
libusrp_inband_la_SOURCES = \
$(BUILT_SOURCES) \
- ../../apps/ui_sincos.c \
+ $(srcdir)/../../apps-inband/ui_sincos.c \
usrp_inband_usb_packet.cc \
usrp_rx.cc \
usrp_rx_stub.cc \
@@ -65,7 +65,7 @@
libusrp_inband_la_LIBADD = \
$(MBLOCK_LA) \
- ../legacy/libusrp.la \
+ $(USRP_LA) \
-lstdc++
include_HEADERS = \
@@ -103,12 +103,9 @@
# magic flags
libusrp_inband_qa_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
-# link against c++ standard library
libusrp_inband_qa_la_LIBADD = \
libusrp_inband.la \
$(CPPUNIT_LIBS) \
- ../legacy/libusrp.la \
- libusrp_inband.la \
-lstdc++
# ------------------------------------------------------------------------
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r6320 - in gnuradio/branches/developers/eb/usrp-la: . config usrp/host usrp/host/apps usrp/host/apps-inband usrp/host/lib/inband,
eb <=