X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gr-usrp%2Fsrc%2FMakefile.in;h=f41a1f603ab3b13555bc59d7f67572512eaf7e7d;hb=b78ae1de4d9bbde942e5e7556630d7ccd8161c30;hp=8821a9c623c024823f3e8e723f8c0fc8da94ca96;hpb=18a684bf3dc144c48fc4cc6cc72f5070febd8074;p=debian%2Fgnuradio

diff --git a/gr-usrp/src/Makefile.in b/gr-usrp/src/Makefile.in
index 8821a9c6..f41a1f60 100644
--- a/gr-usrp/src/Makefile.in
+++ b/gr-usrp/src/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
 # 
@@ -88,7 +88,7 @@ DIST_COMMON = $(grinclude_HEADERS) $(noinst_PYTHON) \
 subdir = gr-usrp/src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \
-	$(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \
+	$(top_srcdir)/config/cppunit.m4 \
 	$(top_srcdir)/config/gr_boost.m4 \
 	$(top_srcdir)/config/gr_check_createfilemapping.m4 \
 	$(top_srcdir)/config/gr_check_shm_open.m4 \
@@ -146,8 +146,11 @@ am__installdirs = "$(DESTDIR)$(ourlibdir)" "$(DESTDIR)$(ourpythondir)" \
 ourlibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(ourlib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-_usrp1_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+am__DEPENDENCIES_2 =  \
+	$(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la
+am__DEPENDENCIES_3 = $(top_builddir)/usrp/host/lib/libusrp.la
+_usrp1_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_3)
 am__usrp1_la_OBJECTS = usrp1.lo usrp1_sink_base.lo usrp1_sink_c.lo \
 	usrp1_sink_s.lo usrp1_source_base.lo usrp1_source_c.lo \
 	usrp1_source_s.lo
@@ -409,25 +412,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.
@@ -501,8 +496,8 @@ _usrp1_la_SOURCES = \
 
 _usrp1_la_LIBADD = \
 	$(PYTHON_LDFLAGS)		\
-	$(GNURADIO_CORE_LIBS)		\
-	$(USRP_LIBS)			\
+	$(GNURADIO_CORE_LA)		\
+	$(USRP_LA)			\
 	-lstdc++
 
 _usrp1_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version