X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gnuradio-core%2Fsrc%2Flib%2Fswig%2FMakefile.in;h=04319570459600c4128a30263288c0ac1bbc7c46;hb=b78ae1de4d9bbde942e5e7556630d7ccd8161c30;hp=81a9e088aecb73695f68a9a3bbc40d278e7315b7;hpb=0cfd4875e519e2b1ee05d074f72ec67391ed13bf;p=debian%2Fgnuradio

diff --git a/gnuradio-core/src/lib/swig/Makefile.in b/gnuradio-core/src/lib/swig/Makefile.in
index 81a9e088..04319570 100644
--- a/gnuradio-core/src/lib/swig/Makefile.in
+++ b/gnuradio-core/src/lib/swig/Makefile.in
@@ -37,7 +37,7 @@
 
 # -*- Makefile -*-
 #
-# Copyright 2004,2006 Free Software Foundation, Inc.
+# Copyright 2004,2006,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -145,10 +145,11 @@ am__installdirs = "$(DESTDIR)$(grgrlibdir)" \
 	"$(DESTDIR)$(swigincludedir)"
 grgrlibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(grgrlib_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-_gnuradio_swig_python_la_DEPENDENCIES =  \
-	$(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la \
-	$(am__DEPENDENCIES_1)
+am__DEPENDENCIES_1 =  \
+	$(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la
+am__DEPENDENCIES_2 =
+_gnuradio_swig_python_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_2)
 am__gnuradio_swig_python_la_OBJECTS = gnuradio_swig_python.lo
 _gnuradio_swig_python_la_OBJECTS =  \
 	$(am__gnuradio_swig_python_la_OBJECTS)
@@ -409,25 +410,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \
 	            $(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
-
+# How to link in GNU Radio core library from inside the tree
+GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la
 
 # 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.
+# How to link in the USRP library from inside the 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
+USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la
 
 # This used to be set in configure.ac but is now defined here for all 
 # Makefiles when this fragment is included.
@@ -472,7 +465,7 @@ _gnuradio_swig_python_la_SOURCES = \
 	gnuradio_swig_python.cc		
 
 _gnuradio_swig_python_la_LIBADD = \
-	$(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la	\
+	$(GNURADIO_CORE_LA)				\
 	$(PYTHON_LDFLAGS)				\
 	-lstdc++
 
@@ -853,7 +846,7 @@ gnuradio_swig_python.cc : gnuradio.i
 	else rm -f gnuradio_swig_python.Td; exit 1; fi 
 
 gnuradio_swig_bug_workaround.h : gnuradio_swig_python.cc $(srcdir)/gen-swig-bug-fix
-	$(srcdir)/gen-swig-bug-fix gnuradio_swig_python.cc $@
+	$(PYTHON) $(srcdir)/gen-swig-bug-fix gnuradio_swig_python.cc $@
 
 # ----------------------------------------------------------------