X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile.common;h=e7d928682c435d4b9ec5ea821ce906da367176c3;hb=9ba03b638d49f5f59b44ff4c1de9bb98726cad3a;hp=2259cac0aba7e7bfde7b2167ff682ff6da8f5c1d;hpb=5d69a524f81f234b3fbc41d49ba18d6f6886baba;p=debian%2Fgnuradio

diff --git a/Makefile.common b/Makefile.common
index 2259cac0..e7d92868 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -16,10 +16,12 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
 # 
 
+AM_CXXFLAGS = @autoconf_default_CXXFLAGS@
+
 # includes
 grincludedir   = $(includedir)/gnuradio
 
@@ -36,5 +38,47 @@ grpyexecdir = $(pyexecdir)/gnuradio
 # swig flags
 SWIGPYTHONFLAGS = -fvirtual -python -modern
 
-# gnuradio-core library link command
-GNURADIO_CORE_LIBS = -L$(top_srcdir)/gnuradio-core/src/lib/.libs -lgnuradio-core -lfftw3f -lm
+# Where to find gnuradio include files in the current build tree
+# top_srcdir for original stuff, top_builddir for generated files
+GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \
+		    -I$(top_srcdir)/gnuradio-core/src/lib/general \
+		    -I$(top_builddir)/gnuradio-core/src/lib/general \
+		    -I$(top_srcdir)/gnuradio-core/src/lib/gengen \
+		    -I$(top_builddir)/gnuradio-core/src/lib/gengen \
+		    -I$(top_srcdir)/gnuradio-core/src/lib/filter \
+		    -I$(top_builddir)/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/omnithread \
+		    -I$(top_srcdir)/gnuradio-core/src/lib/swig \
+		    -I$(top_builddir)/gnuradio-core/src/lib/swig \
+	            $(FFTW3F_CFLAGS)
+
+
+# These used to be set in PKGCONFIG but now point to the current
+# build tree.
+GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \
+                     -lgnuradio-core -lfftw3f -lm
+
+# This is a dependency for many swig operations
+GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+
+# The below used to be set in PKGCONFIG but now point to the current
+# build tree.
+USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \
+		-I$(top_srcdir)/usrp/firmware/include
+
+USRP_LIBS = -L$(top_builddir)/usrp/host/lib \
+	    -lusrp
+
+PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib
+PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt
+
+# This used to be set in configure.ac but is now defined here for all 
+# Makefiles when this fragment is included.
+STD_DEFINES_AND_INCLUDES=$(DEFINES) $(GNURADIO_INCLUDES) $(BOOST_CFLAGS)
+
+# Fix for BSD make not defining $(RM).  We define it now in configure.ac
+# using AM_PATH_PROG, but now here have to add a -f to be like GNU make
+RM=$(RM_PROG) -f