X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=usrp%2Fdoc%2FMakefile.in;h=8e8c8b3764e3a6c5bb3b2a8b2c22243c28fb6d59;hb=b78ae1de4d9bbde942e5e7556630d7ccd8161c30;hp=36ae401f7a9da78546225aa4d4493f50067ee8f1;hpb=18a684bf3dc144c48fc4cc6cc72f5070febd8074;p=debian%2Fgnuradio

diff --git a/usrp/doc/Makefile.in b/usrp/doc/Makefile.in
index 36ae401f..8e8c8b37 100644
--- a/usrp/doc/Makefile.in
+++ b/usrp/doc/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
 # 
@@ -84,7 +84,7 @@ DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.am \
 subdir = usrp/doc
 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 \
@@ -379,25 +379,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.
@@ -742,7 +734,7 @@ html/index.html:
 docbook-html: usrp_guide.html
 
 usrp_guide.html: usrp_guide.xml
-	xmlto html-nochunks $<
+	xmlto html-nochunks $(top_srcdir)/usrp/doc/usrp_guide.xml
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(docdir)