X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=gnuradio-core%2Fsrc%2Ftests%2FMakefile.in;h=1dff732ecc8cd5d656dc4b4974f347cc48a524dd;hb=b78ae1de4d9bbde942e5e7556630d7ccd8161c30;hp=3ebbffc923b03267f164cf70f379637d6b682fb0;hpb=0cfd4875e519e2b1ee05d074f72ec67391ed13bf;p=debian%2Fgnuradio

diff --git a/gnuradio-core/src/tests/Makefile.in b/gnuradio-core/src/tests/Makefile.in
index 3ebbffc9..1dff732e 100644
--- a/gnuradio-core/src/tests/Makefile.in
+++ b/gnuradio-core/src/tests/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
 # 
@@ -144,46 +144,47 @@ am_benchmark_dotprod_OBJECTS = benchmark_dotprod.$(OBJEXT)
 benchmark_dotprod_OBJECTS = $(am_benchmark_dotprod_OBJECTS)
 am__DEPENDENCIES_1 =  \
 	$(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la
-benchmark_dotprod_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+benchmark_dotprod_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_benchmark_dotprod_ccc_OBJECTS = benchmark_dotprod_ccc.$(OBJEXT)
 benchmark_dotprod_ccc_OBJECTS = $(am_benchmark_dotprod_ccc_OBJECTS)
-benchmark_dotprod_ccc_DEPENDENCIES = $(am__DEPENDENCIES_1)
+benchmark_dotprod_ccc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_benchmark_dotprod_ccf_OBJECTS = benchmark_dotprod_ccf.$(OBJEXT)
 benchmark_dotprod_ccf_OBJECTS = $(am_benchmark_dotprod_ccf_OBJECTS)
-benchmark_dotprod_ccf_DEPENDENCIES = $(am__DEPENDENCIES_1)
+benchmark_dotprod_ccf_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_benchmark_dotprod_fcc_OBJECTS = benchmark_dotprod_fcc.$(OBJEXT)
 benchmark_dotprod_fcc_OBJECTS = $(am_benchmark_dotprod_fcc_OBJECTS)
-benchmark_dotprod_fcc_DEPENDENCIES = $(am__DEPENDENCIES_1)
+benchmark_dotprod_fcc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_benchmark_dotprod_fsf_OBJECTS = benchmark_dotprod_fsf.$(OBJEXT)
 benchmark_dotprod_fsf_OBJECTS = $(am_benchmark_dotprod_fsf_OBJECTS)
-benchmark_dotprod_fsf_DEPENDENCIES = $(am__DEPENDENCIES_1)
+benchmark_dotprod_fsf_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_benchmark_dotprod_scc_OBJECTS = benchmark_dotprod_scc.$(OBJEXT)
 benchmark_dotprod_scc_OBJECTS = $(am_benchmark_dotprod_scc_OBJECTS)
-benchmark_dotprod_scc_DEPENDENCIES = $(am__DEPENDENCIES_1)
+benchmark_dotprod_scc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_benchmark_nco_OBJECTS = benchmark_nco.$(OBJEXT)
 benchmark_nco_OBJECTS = $(am_benchmark_nco_OBJECTS)
-benchmark_nco_DEPENDENCIES = $(am__DEPENDENCIES_1)
+benchmark_nco_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_benchmark_vco_OBJECTS = benchmark_vco.$(OBJEXT)
 benchmark_vco_OBJECTS = $(am_benchmark_vco_OBJECTS)
-benchmark_vco_DEPENDENCIES = $(am__DEPENDENCIES_1)
+benchmark_vco_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_all_OBJECTS = test_all.$(OBJEXT)
 test_all_OBJECTS = $(am_test_all_OBJECTS)
-am__DEPENDENCIES_2 =  \
+am__DEPENDENCIES_3 =  \
 	$(top_builddir)/gnuradio-core/src/lib/libgnuradio-core-qa.la \
-	$(am__DEPENDENCIES_1)
-test_all_DEPENDENCIES = $(am__DEPENDENCIES_2)
+	$(am__DEPENDENCIES_2)
+test_all_DEPENDENCIES = $(am__DEPENDENCIES_3)
 am_test_filter_OBJECTS = test_filter.$(OBJEXT)
 test_filter_OBJECTS = $(am_test_filter_OBJECTS)
-test_filter_DEPENDENCIES = $(am__DEPENDENCIES_2)
+test_filter_DEPENDENCIES = $(am__DEPENDENCIES_3)
 am_test_general_OBJECTS = test_general.$(OBJEXT)
 test_general_OBJECTS = $(am_test_general_OBJECTS)
-test_general_DEPENDENCIES = $(am__DEPENDENCIES_2)
+test_general_DEPENDENCIES = $(am__DEPENDENCIES_3)
 am_test_runtime_OBJECTS = test_runtime.$(OBJEXT)
 test_runtime_OBJECTS = $(am_test_runtime_OBJECTS)
-test_runtime_DEPENDENCIES = $(am__DEPENDENCIES_2)
+test_runtime_DEPENDENCIES = $(am__DEPENDENCIES_3)
 am_test_vmcircbuf_OBJECTS = test_vmcircbuf.$(OBJEXT)
 test_vmcircbuf_OBJECTS = $(am_test_vmcircbuf_OBJECTS)
-test_vmcircbuf_DEPENDENCIES = $(am__DEPENDENCIES_2)
+test_vmcircbuf_DEPENDENCIES = $(am__DEPENDENCIES_3)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -452,25 +453,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.
@@ -490,7 +483,7 @@ TESTS = test_all
 EXTRA_DIST = \
 	test_buffers.py
 
-LIBGNURADIO = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la
+LIBGNURADIO = $(GNURADIO_CORE_LA)
 LIBGNURADIOQA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core-qa.la $(LIBGNURADIO)
 benchmark_dotprod_SOURCES = benchmark_dotprod.cc
 benchmark_dotprod_LDADD = $(LIBGNURADIO)