X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gr-trellis%2Fdoc%2FMakefile.in;h=ae9880384d3a33680bbc579ace96e51692222127;hb=b78ae1de4d9bbde942e5e7556630d7ccd8161c30;hp=1c2f406069d62a51857629cd9bdbc19ee0cca029;hpb=0cfd4875e519e2b1ee05d074f72ec67391ed13bf;p=debian%2Fgnuradio

diff --git a/gr-trellis/doc/Makefile.in b/gr-trellis/doc/Makefile.in
index 1c2f4060..ae988038 100644
--- a/gr-trellis/doc/Makefile.in
+++ b/gr-trellis/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
 # 
@@ -373,25 +373,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.
@@ -577,8 +569,8 @@ all: $(HTML_FILES)
 
 # ----------------------------------------------------------------
 
-%.html : %.xml
-	xmlto html-nochunks $<
+gr-trellis.html : gr-trellis.xml
+	xmlto html-nochunks $(top_srcdir)/gr-trellis/doc/gr-trellis.xml
 
 %.xml : % make_numbered_listing.py
 	./make_numbered_listing.py $<