X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile.common;h=31bf0839cc709b075626f822a4f20761902d1d89;hb=30981f7989b22e0e3b837c9420763fffb5586106;hp=f0f02119abd5227b9662b6feeb59a1497f83735b;hpb=edb7183644c9d025a548f74004e4df117647ab3b;p=debian%2Fgnuradio

diff --git a/Makefile.common b/Makefile.common
index f0f02119..31bf0839 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -16,8 +16,8 @@
 # 
 # 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.
 # 
 
 # includes
@@ -37,32 +37,44 @@ grpyexecdir = $(pyexecdir)/gnuradio
 SWIGPYTHONFLAGS = -fvirtual -python -modern
 
 # 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/filter \
-                    -I$(top_srcdir)/gnuradio-core/src/lib/reed-solomon \
+		    -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 \
+		    -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
 
-GNURADIO_I = $(top_builddir)/gnuradio-core/src/lib/swig/gnuradio.i
+# 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
+		-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