[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9507 - in gnuradio/branches/features/gr-usrp2: . conf
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r9507 - in gnuradio/branches/features/gr-usrp2: . config gr-usrp2/src usrp2 usrp2/host usrp2/host/apps usrp2/host/lib |
|
Date: |
Sat, 6 Sep 2008 14:49:30 -0600 (MDT) |
Author: jcorgan
Date: 2008-09-06 14:49:29 -0600 (Sat, 06 Sep 2008)
New Revision: 9507
Added:
gnuradio/branches/features/gr-usrp2/config/grc_usrp2.m4
gnuradio/branches/features/gr-usrp2/usrp2/Makefile.am
Removed:
gnuradio/branches/features/gr-usrp2/gr-usrp2/src/test_gr_usrp2.cc
gnuradio/branches/features/gr-usrp2/usrp2/host/AUTHORS
gnuradio/branches/features/gr-usrp2/usrp2/host/COPYING
gnuradio/branches/features/gr-usrp2/usrp2/host/ChangeLog
gnuradio/branches/features/gr-usrp2/usrp2/host/INSTALL
gnuradio/branches/features/gr-usrp2/usrp2/host/Makefile.common
gnuradio/branches/features/gr-usrp2/usrp2/host/NEWS
gnuradio/branches/features/gr-usrp2/usrp2/host/README
gnuradio/branches/features/gr-usrp2/usrp2/host/bootstrap
gnuradio/branches/features/gr-usrp2/usrp2/host/config/
gnuradio/branches/features/gr-usrp2/usrp2/host/configure.ac
Modified:
gnuradio/branches/features/gr-usrp2/config/grc_gr_usrp2.m4
gnuradio/branches/features/gr-usrp2/configure.ac
gnuradio/branches/features/gr-usrp2/gr-usrp2/src/Makefile.am
gnuradio/branches/features/gr-usrp2/usrp2/
gnuradio/branches/features/gr-usrp2/usrp2/host/Makefile.am
gnuradio/branches/features/gr-usrp2/usrp2/host/apps/Makefile.am
gnuradio/branches/features/gr-usrp2/usrp2/host/lib/Makefile.am
Log:
Make top-level usrp2 component, include usrp2/host in the master build (doesn't
recurse into firmware or fpga yet.)
Modified: gnuradio/branches/features/gr-usrp2/config/grc_gr_usrp2.m4
===================================================================
--- gnuradio/branches/features/gr-usrp2/config/grc_gr_usrp2.m4 2008-09-06
18:50:46 UTC (rev 9506)
+++ gnuradio/branches/features/gr-usrp2/config/grc_gr_usrp2.m4 2008-09-06
20:49:29 UTC (rev 9507)
@@ -20,12 +20,10 @@
AC_DEFUN([GRC_GR_USRP2],[
GRC_ENABLE(gr-usrp2)
- dnl Don't do gr-usrp if gnuradio-core skipped
- GRC_CHECK_DEPENDENCY(gr-usrp, gnuradio-core)
+ dnl Don't do gr-usrp if gnuradio-core or usrp2 skipped
+ GRC_CHECK_DEPENDENCY(gr-usrp2, usrp2)
+ GRC_CHECK_DEPENDENCY(gr-usrp2, gnuradio-core)
- dnl Fetch libusrp2 variables
- PKG_CHECK_MODULES(USRP2, usrp2)
-
AC_CONFIG_FILES([ \
gr-usrp2/Makefile \
gr-usrp2/src/Makefile \
Added: gnuradio/branches/features/gr-usrp2/config/grc_usrp2.m4
===================================================================
--- gnuradio/branches/features/gr-usrp2/config/grc_usrp2.m4
(rev 0)
+++ gnuradio/branches/features/gr-usrp2/config/grc_usrp2.m4 2008-09-06
20:49:29 UTC (rev 9507)
@@ -0,0 +1,53 @@
+dnl Copyright 2008 Free Software Foundation, Inc.
+dnl
+dnl This file is part of GNU Radio
+dnl
+dnl GNU Radio is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3, or (at your option)
+dnl any later version.
+dnl
+dnl GNU Radio is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with GNU Radio; see the file COPYING. If not, write to
+dnl the Free Software Foundation, Inc., 51 Franklin Street,
+dnl Boston, MA 02110-1301, USA.
+
+AC_DEFUN([GRC_USRP2],[
+ GRC_ENABLE(usrp2)
+
+ dnl Don't do usrp if omnithread or gruel is skipped
+ GRC_CHECK_DEPENDENCY(usrp2, gruel)
+ GRC_CHECK_DEPENDENCY(usrp2, omnithread)
+
+ dnl If execution gets to here, $passed will be:
+ dnl with : if the --with code didn't error out
+ dnl yes : if the --enable code passed muster and all dependencies are
met
+ dnl no : otherwise
+ if test $passed != with; then
+ dnl how and where to find INCLUDES and LA
+ USRP2_INCLUDES="-I\${abs_top_srcdir}/usrp2/host/include \
+ -I\${abs_top_srcdir}/usrp2/firmware/include"
+ USRP2_LA="\${abs_top_builddir}/usrp2/host/lib/libusrp2.la"
+ fi
+
+ dnl Include the usrp2 INCLUDES and LA
+ AC_SUBST(USRP2_INCLUDES)
+ AC_SUBST(USRP2_LA)
+
+ AC_CONFIG_FILES([ \
+ usrp2/Makefile
+ usrp2/host/Makefile \
+ usrp2/host/usrp2.pc \
+ usrp2/host/include/Makefile
+ usrp2/host/include/usrp2/Makefile
+ usrp2/host/lib/Makefile
+ usrp2/host/apps/Makefile
+ ])
+
+ GRC_BUILD_CONDITIONAL(usrp2)
+])
Modified: gnuradio/branches/features/gr-usrp2/configure.ac
===================================================================
--- gnuradio/branches/features/gr-usrp2/configure.ac 2008-09-06 18:50:46 UTC
(rev 9506)
+++ gnuradio/branches/features/gr-usrp2/configure.ac 2008-09-06 20:49:29 UTC
(rev 9507)
@@ -135,6 +135,7 @@
AC_CHECK_HEADERS(fcntl.h limits.h strings.h time.h sys/ioctl.h sys/time.h
unistd.h)
AC_CHECK_HEADERS(linux/ppdev.h dev/ppbus/ppi.h sys/mman.h sys/select.h
sys/types.h)
AC_CHECK_HEADERS(sys/resource.h stdint.h sched.h signal.h sys/syscall.h)
+AC_CHECK_HEADERS(arpa/inet.h byteswap.h linux/if_packet.h sys/socket.h
sys/un.h)
AC_CHECK_HEADERS(netinet/in.h)
AC_CHECK_HEADERS(windows.h)
@@ -147,6 +148,16 @@
AC_SUBST(GR_ARCH_BIGENDIAN)
AC_STRUCT_TM
+AC_CHECK_MEMBERS([struct msghdr.msg_control,
+ struct msghdr.msg_accrights,
+ struct cmsgcred.cmcred_uid,
+ struct ucred.uid],
+ [],[],
+ [#define __USE_GNU 1
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>])
+
dnl Checks for library functions.
AC_FUNC_ALLOCA
AC_FUNC_SETVBUF_REVERSED
@@ -280,6 +291,7 @@
GRC_PMT
GRC_MBLOCK dnl this must come after GRC_PMT
GRC_USRP
+GRC_USRP2
GRC_GR_USRP dnl this must come after GRC_USRP
GRC_GR_USRP2
GRC_GR_GCELL dnl this must come after GRC_GCELL and
GRC_GNURADIO_CORE
Modified: gnuradio/branches/features/gr-usrp2/gr-usrp2/src/Makefile.am
===================================================================
--- gnuradio/branches/features/gr-usrp2/gr-usrp2/src/Makefile.am
2008-09-06 18:50:46 UTC (rev 9506)
+++ gnuradio/branches/features/gr-usrp2/gr-usrp2/src/Makefile.am
2008-09-06 20:49:29 UTC (rev 9507)
@@ -28,8 +28,9 @@
# ----------------------------------------------------------------------
AM_CPPFLAGS = \
$(STD_DEFINES_AND_INCLUDES) \
+ $(GRUEL_INCLUDES) \
$(PYTHON_CPPFLAGS) \
- $(USRP2_CFLAGS) \
+ $(USRP2_INCLUDES) \
$(WITH_INCLUDES)
lib_LTLIBRARIES = libgr-usrp2.la
@@ -46,8 +47,8 @@
# usrp2_sink_16sc.cc
libgr_usrp2_la_LIBADD = \
- $(USRP2_LIBS) \
- $(GNURADIO_CORE_LA)
+ $(USRP2_LA) \
+ $(GNURADIO_CORE_LA)
include_HEADERS = \
usrp2_source_base.h \
@@ -62,15 +63,6 @@
rx_32fc_handler.h
# ----------------------------------------------------------------------
-# C++ binaries, not installed
-#
-# test_gr_usrp2
-# ----------------------------------------------------------------------
-noinst_PROGRAMS = test_gr_usrp2
-test_gr_usrp2_SOURCES = test_gr_usrp2.cc
-test_gr_usrp2_LDADD = libgr-usrp2.la
-
-# ----------------------------------------------------------------------
# Python SWIG wrapper around C++ library
#
# usrp2.py
@@ -99,7 +91,7 @@
SWIGPYTHONARGS = \
$(STD_DEFINES_AND_INCLUDES) \
$(SWIGPYTHONFLAGS) \
- -I$(USRP2_INCLUDEDIR) \
+ $(USRP2_INCLUDES) \
$(WITH_INCLUDES) \
$(WITH_SWIG_INCLUDES)
Deleted: gnuradio/branches/features/gr-usrp2/gr-usrp2/src/test_gr_usrp2.cc
Property changes on: gnuradio/branches/features/gr-usrp2/usrp2
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Added: gnuradio/branches/features/gr-usrp2/usrp2/Makefile.am
===================================================================
--- gnuradio/branches/features/gr-usrp2/usrp2/Makefile.am
(rev 0)
+++ gnuradio/branches/features/gr-usrp2/usrp2/Makefile.am 2008-09-06
20:49:29 UTC (rev 9507)
@@ -0,0 +1,23 @@
+#
+# Copyright 2008 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS = host
Deleted: gnuradio/branches/features/gr-usrp2/usrp2/host/AUTHORS
Deleted: gnuradio/branches/features/gr-usrp2/usrp2/host/COPYING
Deleted: gnuradio/branches/features/gr-usrp2/usrp2/host/ChangeLog
Deleted: gnuradio/branches/features/gr-usrp2/usrp2/host/INSTALL
Modified: gnuradio/branches/features/gr-usrp2/usrp2/host/Makefile.am
===================================================================
--- gnuradio/branches/features/gr-usrp2/usrp2/host/Makefile.am 2008-09-06
18:50:46 UTC (rev 9506)
+++ gnuradio/branches/features/gr-usrp2/usrp2/host/Makefile.am 2008-09-06
20:49:29 UTC (rev 9507)
@@ -1,5 +1,5 @@
#
-# Copyright 2007, 2008 Free Software Foundation, Inc.
+# Copyright 2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -18,16 +18,12 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-ACLOCAL_AMFLAGS = -I config
-
include $(top_srcdir)/Makefile.common
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = usrp2.pc
EXTRA_DIST = \
- configure \
- config.h.in \
usrp2.pc.in
-SUBDIRS = config include lib apps
+SUBDIRS = include lib apps
Deleted: gnuradio/branches/features/gr-usrp2/usrp2/host/Makefile.common
Deleted: gnuradio/branches/features/gr-usrp2/usrp2/host/NEWS
Deleted: gnuradio/branches/features/gr-usrp2/usrp2/host/README
Modified: gnuradio/branches/features/gr-usrp2/usrp2/host/apps/Makefile.am
===================================================================
--- gnuradio/branches/features/gr-usrp2/usrp2/host/apps/Makefile.am
2008-09-06 18:50:46 UTC (rev 9506)
+++ gnuradio/branches/features/gr-usrp2/usrp2/host/apps/Makefile.am
2008-09-06 20:49:29 UTC (rev 9507)
@@ -17,11 +17,16 @@
include $(top_srcdir)/Makefile.common
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(GRUEL_CFLAGS)
+AM_CPPFLAGS = \
+ $(USRP2_INCLUDES) \
+ $(STD_DEFINES_AND_INCLUDES) \
+ $(CPPUNIT_INCLUDES) \
+ $(GRUEL_INCLUDES)
LDADD = \
- ../lib/libusrp2.la \
- -lgruel
+ $(USRP2_LA) \
+ $(GRUEL_LA) \
+ $(OMNITHREAD_LA)
bin_PROGRAMS = \
find_usrps \
Deleted: gnuradio/branches/features/gr-usrp2/usrp2/host/bootstrap
Deleted: gnuradio/branches/features/gr-usrp2/usrp2/host/configure.ac
Modified: gnuradio/branches/features/gr-usrp2/usrp2/host/lib/Makefile.am
===================================================================
--- gnuradio/branches/features/gr-usrp2/usrp2/host/lib/Makefile.am
2008-09-06 18:50:46 UTC (rev 9506)
+++ gnuradio/branches/features/gr-usrp2/usrp2/host/lib/Makefile.am
2008-09-06 20:49:29 UTC (rev 9507)
@@ -17,8 +17,12 @@
include $(top_srcdir)/Makefile.common
-#AM_CXXFLAGS = -Wall -Werror (handle this with: $ ./configure CXXFLAGS="-Wall
-Werror -O2 -g")
-AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES)
$(CPPUNIT_INCLUDES) $(GRUEL_CFLAGS)
+AM_CPPFLAGS = \
+ $(USRP2_INCLUDES) \
+ $(BOOST_CPPFLAGS) \
+ $(STD_DEFINES_AND_INCLUDES) \
+ $(CPPUNIT_INCLUDES) \
+ $(GRUEL_INCLUDES)
bin_PROGRAMS = usrp2_socket_opener
usrp2_socket_opener_SOURCES = usrp2_socket_opener.cc
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9507 - in gnuradio/branches/features/gr-usrp2: . config gr-usrp2/src usrp2 usrp2/host usrp2/host/apps usrp2/host/lib,
jcorgan <=