X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gnuradio-core%2Fsrc%2Flib%2Fgeneral%2FMakefile.in;h=5495d60163a94247d58f55e8c30055aa41f6e1e0;hb=b78ae1de4d9bbde942e5e7556630d7ccd8161c30;hp=a636e03ee1b7ebb48e7121eadafee1c8fa1116ae;hpb=18a684bf3dc144c48fc4cc6cc72f5070febd8074;p=debian%2Fgnuradio

diff --git a/gnuradio-core/src/lib/general/Makefile.in b/gnuradio-core/src/lib/general/Makefile.in
index a636e03e..5495d601 100644
--- a/gnuradio-core/src/lib/general/Makefile.in
+++ b/gnuradio-core/src/lib/general/Makefile.in
@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# Copyright 2001,2002,2004,2006 Free Software Foundation, Inc.
+# Copyright 2001,2002,2004,2006,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -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 = README $(grinclude_HEADERS) $(noinst_HEADERS) \
 subdir = gnuradio-core/src/lib/general
 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 \
@@ -485,25 +485,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.
@@ -526,9 +518,15 @@ CODE_GENERATOR = \
 	gr_add_const_XX.cc.t		\
 	gr_add_const_XX.h.t		\
 	gr_add_const_XX.i.t		\
-        gr_chunks_to_symbols_XX.cc.t	\
-        gr_chunks_to_symbols_XX.h.t	\
-        gr_chunks_to_symbols_XX.i.t	\
+	gr_add_vXX.cc.t			\
+	gr_add_vXX.h.t			\
+	gr_add_vXX.i.t			\
+	gr_add_const_vXX.cc.t		\
+	gr_add_const_vXX.h.t		\
+	gr_add_const_vXX.i.t		\
+	gr_chunks_to_symbols_XX.cc.t	\
+	gr_chunks_to_symbols_XX.h.t	\
+	gr_chunks_to_symbols_XX.i.t	\
 	gr_divide_XX.cc.t		\
 	gr_divide_XX.h.t		\
 	gr_divide_XX.i.t		\
@@ -538,6 +536,12 @@ CODE_GENERATOR = \
 	gr_multiply_const_XX.cc.t	\
 	gr_multiply_const_XX.h.t	\
 	gr_multiply_const_XX.i.t	\
+	gr_multiply_vXX.cc.t		\
+	gr_multiply_vXX.h.t		\
+	gr_multiply_vXX.i.t		\
+	gr_multiply_const_vXX.cc.t	\
+	gr_multiply_const_vXX.h.t	\
+	gr_multiply_const_vXX.i.t	\
 	gr_mute_XX.cc.t			\
 	gr_mute_XX.h.t			\
 	gr_mute_XX.i.t			\
@@ -1675,7 +1679,7 @@ uninstall-am: uninstall-grincludeHEADERS uninstall-info-am \
 # include $(srcdir)/Makefile.gen
 
 $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): $(CODE_GENERATOR)
-	PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(srcdir)/generate_all.py
+	PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: