From 40b8a57d69b4b85f207fb0408347c210e23202cc Mon Sep 17 00:00:00 2001
From: jcorgan
Date: Wed, 27 May 2009 01:54:41 +0000
Subject: Merged r11123:11148 from jcorgan/np into trunk.

Adds --enable-python option to configure (defaults to yes).

Using --disable-python or --enable-python=no will cause only
C++ API targets to be created and installed.

Several new shared libraries are now created.  Where in the past,
the C++ objects of the actual gnuradio blocks that were in a component
were hidden inside their corresponding Python extension modules, these
are now split out into a libgnuradio-foo.so library, and the _foo.so
Python module is linked to that.  This has been the way several top-
level components have operated for some time, such as gr-audio-alsa
and gr-usrp and gr-usrp2.  This changeset applies that pattern to all
components.

C++ API users can use pkg-config to discover the cflags and libs 
parameters needed to include and link against these libraries.

These components have not been tested:

gr-comedi
gr-audio-osx
gr-audio-windows

Passes distcheck.



git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11150 221aa14e-8319-0410-a670-987f0aec2ac5
---
 gr-gcell/src/Makefile.am | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'gr-gcell')

diff --git a/gr-gcell/src/Makefile.am b/gr-gcell/src/Makefile.am
index 83dc30f45..f44095b47 100644
--- a/gr-gcell/src/Makefile.am
+++ b/gr-gcell/src/Makefile.am
@@ -22,10 +22,6 @@ include $(top_srcdir)/Makefile.common
 
 SUBDIRS = . examples
 
-EXTRA_DIST = run_tests.in
-
-TESTS = run_tests
-
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(GCELL_INCLUDES) \
 	$(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
@@ -43,24 +39,27 @@ DISTCLEANFILES = \
 # ----------------------------------------------------------------
 
 # the library for the C++ blocks
-lib_LTLIBRARIES = libgr_gcell.la
+lib_LTLIBRARIES = libgnuradio_gcell.la
 
-libgr_gcell_la_SOURCES = \
+libgnuradio_gcell_la_SOURCES = \
 	gcell_fft_vcc.cc
 
 # C/C++ headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS = \
 	gcell_fft_vcc.h
 
-libgr_gcell_la_LIBADD = \
+libgnuradio_gcell_la_LIBADD = \
 	$(GNURADIO_CORE_LA) \
 	$(GCELL_LA)
 
-libgr_gcell_la_LDFLAGS = $(NO_UNDEFINED)
+libgnuradio_gcell_la_LDFLAGS = $(NO_UNDEFINED)
 
+if PYTHON
 # ----------------------------------------------------------------
 #                         SWIG stuff
 # ----------------------------------------------------------------
+EXTRA_DIST = run_tests.in
+TESTS = run_tests
 
 TOP_SWIG_IFILES =		\
 	gcell.i
@@ -78,7 +77,7 @@ gcell_swig_args =		\
 
 # additional libraries for linking with the SWIG-generated library
 gcell_la_swig_libadd =		\
-	libgr_gcell.la
+	libgnuradio_gcell.la
 
 # additional SWIG files to be installed
 gcell_swiginclude_headers =	\
@@ -92,3 +91,4 @@ BUILT_SOURCES = $(swig_built_sources)
 
 # Do not distribute the output of SWIG
 no_dist_files = $(swig_built_sources)
+endif
-- 
cgit