Partial fix for ticket 10 merged into trunk from

branches/developers/jcorgan/ticket-10

As of this merge the trunk and the above branch are identical.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3182 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/Makefile.common b/Makefile.common
index 089519438fb0feb5bffe3dcb8034f37ef74eb351..786e8e5a8e7aa6c8e02baebe8ef34dea65034c1b 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -36,5 +36,27 @@ grpyexecdir = $(pyexecdir)/gnuradio
 # swig flags
 SWIGPYTHONFLAGS = -fvirtual -python -modern
 
-# gnuradio-core library link command
-GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib -lgnuradio-core -lfftw3f -lm
+GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \
+                   -I$(top_srcdir)/gnuradio-core/src/lib/general \
+                   -I$(top_srcdir)/gnuradio-core/src/lib/filter \
+                    -I$(top_srcdir)/gnuradio-core/src/lib/reed-solomon \
+                   -I$(top_srcdir)/gnuradio-core/src/lib/io \
+                   -I$(top_srcdir)/gnuradio-core/src/lib/g72x \
+                   -I$(top_srcdir)/gnuradio-core/src/lib/atsc \
+                   -I$(top_srcdir)/gnuradio-core/src/lib/omnithread \
+                   -I$(top_srcdir)/gnuradio-core/src/lib/swig \
+                    -I$(top_builddir)/gnuradio-core/src/lib/swig \
+                   $(FFTW3F_CFLAGS)
+
+GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \
+                     -lgnuradio-core -lfftw3f -lm
+
+GNURADIO_I = $(top_builddir)/gnuradio-core/src/lib/swig/gnuradio.i
+
+USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \
+               -I$(top_srcdir)/usrp/firmware/include
+
+USRP_LIBS = -L$(top_builddir)/usrp/host/lib \
+           -lusrp
+
+STD_DEFINES_AND_INCLUDES=$(DEFINES) $(GNURADIO_INCLUDES) $(BOOST_CFLAGS)

diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4
index 5ef847a445375308aeb3a08dc183cbc3b279ddb9..0883e395193466d883f880b3aca615d305819f70 100644 (file)
--- a/config/grc_usrp.m4
+++ b/config/grc_usrp.m4
@@ -67,21 +67,6 @@ AC_DEFUN([GRC_USRP],[
     AC_C_BIGENDIAN
 
     if test $succeeded = yes; then
-       dnl Define where to look for USRP includes
-       USRP_INCLUDES='-I$(top_srcdir)/usrp/host/lib -I$(top_srcdir)/usrp/firmware/include'
-       AC_SUBST(USRP_INCLUDES)
-
-        USRP_DEFINES=''
-        AC_SUBST(USRP_DEFINES)
-
-       dnl Define where to find USRP library
-       USRP_LIBS='-L$(top_builddir)/usrp/host/lib -lusrp'
-       AC_SUBST(USRP_LIBS)
-
-       dnl FIXME this looked very suspicious
-        dnl DEFINES="$USRP_DEFINES"
-        dnl AC_SUBST(DEFINES)
-
        subdirs="$subdirs usrp"
     else
        failed="$failed usrp"

diff --git a/configure.ac b/configure.ac
index 3dbbae84ed0cfe53c168be21aeb60f584fcd8f15..c29203a7c53976be7bb327e7ec604f610e0a3101 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -128,10 +128,6 @@ dnl conditional build stuff
 GR_CHECK_DOXYGEN
 GR_SET_MD_CPU
 
-dnl Define where to look for GNURADIO includes
-GNURADIO_INCLUDES='-I$(top_srcdir)/gnuradio-core/src/lib/runtime -I$(top_srcdir)/gnuradio-core/src/lib/general -I$(top_srcdir)/gnuradio-core/src/lib/filter -I$(top_srcdir)/gnuradio-core/src/lib/io -I$(top_srcdir)/gnuradio-core/src/lib/g72x -I$(top_srcdir)/gnuradio-core/src/lib/atsc -I$(top_srcdir)/gnuradio-core/src/lib/omnithread -I$(top_builddir)/gnuradio-core/src/lib/general -I$(top_builddir)/gnuradio-core/src/lib/filter -I$(top_builddir)/gnuradio-core/src/lib/reed-solomon -I$(top_builddir)/gnuradio-core/src/lib/swig $(FFTW3F_CFLAGS)'
-AC_SUBST(GNURADIO_INCLUDES)
-
 dnl Define where to look for cppunit includes and libs
 dnl sets CPPUNIT_CFLAGS and CPPUNIT_LIBS
 AM_PATH_CPPUNIT([1.9.14],[],
@@ -147,9 +143,6 @@ GR_REQUIRE_BOOST_INCLUDES
 DEFINES=""
 AC_SUBST(DEFINES)
 
-STD_DEFINES_AND_INCLUDES="$DEFINES $GNURADIO_INCLUDES $BOOST_CFLAGS"
-AC_SUBST(STD_DEFINES_AND_INCLUDES)
-
 dnl Component specific configuration
 dnl The order of the GR_ macros determines the order of compilation
 subdirs="config"

diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index 611dd604d9568f060e090eaa236c2039ef0a7b78..4b502f5daa7d6d791379f1956e88f831eb094270 100644 (file)
--- a/gr-usrp/src/Makefile.am
+++ b/gr-usrp/src/Makefile.am
@@ -34,8 +34,7 @@ TESTS = run_tests
 LOCAL_IFILES =                                 \
        usrp1.i                         
 
-NON_LOCAL_IFILES =                     \
-       $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+NON_LOCAL_IFILES = $(GNURADIO_I)
 
 ALL_IFILES =                           \
        $(LOCAL_IFILES)                 \
@@ -60,9 +59,13 @@ ourpython_PYTHON =                   \
         usrp_multi.py                  
 
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(USRP_INCLUDES)
+INCLUDES = $(STD_DEFINES_AND_INCLUDES)  \
+          $(PYTHON_CPPFLAGS)           \
+          $(USRP_INCLUDES)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) $(USRP_INCLUDES)
+SWIGPYTHONARGS = $(SWIGPYTHONFLAGS)         \
+                $(STD_DEFINES_AND_INCLUDES) \
+                $(USRP_INCLUDES)
 
 grinclude_HEADERS =                    \
        usrp1_sink_base.h               \
@@ -114,4 +117,3 @@ MOSTLYCLEANFILES = \
 dist-hook:
        @for file in $(BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done
        @for file in $(BUILT_SOURCES); do $(RM) $(distdir)/$$file; done
-

diff --git a/usrp/host/apps/Makefile.am b/usrp/host/apps/Makefile.am
index b08e325277f2e069cf31a97116d89d860aba8c2f..87a3774a08986b396ee87f310a816987bb664b47 100644 (file)
--- a/usrp/host/apps/Makefile.am
+++ b/usrp/host/apps/Makefile.am
@@ -19,7 +19,11 @@
 # Boston, MA 02111-1307, USA.
 # 
 
-INCLUDES = -I../lib -I$(top_srcdir)/usrp/firmware/include
+include $(top_srcdir)/Makefile.common
+
+INCLUDES = $(USRP_INCLUDES)
+
+USRP_LIB = $(top_builddir)/usrp/host/lib/libusrp.la
 
 bin_PROGRAMS =                         \
        usrper                          \
@@ -41,13 +45,13 @@ noinst_PYTHON =                             \
 check_order_quickly_SOURCES    = check_order_quickly.cc
 
 test_usrp_standard_rx_SOURCES  = test_usrp_standard_rx.cc time_stuff.c
-test_usrp_standard_rx_LDADD    = $(top_builddir)/usrp/host/lib/libusrp.la
+test_usrp_standard_rx_LDADD    = $(USRP_LIB)
 
 test_usrp_standard_tx_SOURCES  = test_usrp_standard_tx.cc time_stuff.c
-test_usrp_standard_tx_LDADD    = $(top_builddir)/usrp/host/lib/libusrp.la
+test_usrp_standard_tx_LDADD    = $(USRP_LIB)
 
 usrper_SOURCES                 = usrper.cc
-usrper_LDADD                   = $(top_builddir)/usrp/host/lib/libusrp.la
+usrper_LDADD                   = $(USRP_LIB)
 
 usrp_cal_dc_offset_SOURCES     = usrp_cal_dc_offset.cc
-usrp_cal_dc_offset_LDADD       = $(top_builddir)/usrp/host/lib/libusrp.la
+usrp_cal_dc_offset_LDADD       = $(USRP_LIB)

diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am
index e2086bc2ce4b300e587c9b83665d16aa613f542d..eff0384606e598fe204b0ed9368c3687454d643f 100644 (file)
--- a/usrp/host/lib/Makefile.am
+++ b/usrp/host/lib/Makefile.am
@@ -17,7 +17,10 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 # 
-INCLUDES = -I$(top_srcdir)/usrp/firmware/include
+
+include $(top_srcdir)/Makefile.common
+
+INCLUDES = $(USRP_INCLUDES)
 
 lib_LTLIBRARIES = libusrp.la
 

diff --git a/usrp/host/swig/Makefile.am b/usrp/host/swig/Makefile.am
index 5b15a363424312e5afe664d99937d8dcbf615eb4..2a1f5b8a5d54570de5fc10d4960d0dbf0e53464a 100644 (file)
--- a/usrp/host/swig/Makefile.am
+++ b/usrp/host/swig/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2001,2003,2004 Free Software Foundation, Inc.
+# Copyright 2001,2003,2004,2006 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -27,6 +27,9 @@ include $(top_srcdir)/Makefile.common
 ourpythondir = $(pythondir)
 ourlibdir    = $(pyexecdir)
 
+INCLUDES = $(USRP_INCLUDES)            \
+          $(PYTHON_CPPFLAGS)           \
+          -I$(srcdir)
 
 LOCAL_IFILES =                         \
        prims.i
@@ -51,9 +54,6 @@ ourpython_PYTHON =                    \
        usrp_prims.py                   
 
 
-INCLUDES = $(USRP_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir)
-
-
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES)