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

3 files changed, 34 insertions, 13 deletions

diff --git a/gr-video-sdl/Makefile.am b/gr-video-sdl/Makefile.am
index 2b6e6c8f3..75efb3b60 100644
--- a/gr-video-sdl/Makefile.am
+++ b/gr-video-sdl/Makefile.am
@@ -22,3 +22,6 @@
 include $(top_srcdir)/Makefile.common
 
 SUBDIRS = src
+
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-video-sdl.pc
diff --git a/gr-video-sdl/gnuradio-video-sdl.pc.in b/gr-video-sdl/gnuradio-video-sdl.pc.in
new file mode 100644
index 000000000..9a8fe7d5e
--- /dev/null
+++ b/gr-video-sdl/gnuradio-video-sdl.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: gnuradio-comedi
+Description: GNU Radio blocks for the SDL library
+Requires: gnuradio-core sdl
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-video-sdl
+Cflags: -I${includedir}
diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am
index 04139afde..e623eb2a9 100644
--- a/gr-video-sdl/src/Makefile.am
+++ b/gr-video-sdl/src/Makefile.am
@@ -23,22 +23,34 @@ include $(top_srcdir)/Makefile.common
 
 EXTRA_DIST = run_tests.in
 
-TESTS = run_tests
-
-DISTCLEANFILES = run_tests
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS) \
+	$(WITH_INCLUDES)
 
 noinst_PYTHON =				\
 	qa_video_sdl.py
 
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS) \
-	$(WITH_INCLUDES)
-
 grinclude_HEADERS =			\
 	video_sdl_sink_uc.h		\
 	video_sdl_sink_s.h
 
+lib_LTLIBRARIES = libgnuradio-video-sdl.la
+
+libgnuradio_video_sdl_la_SOURCES = 	\
+	video_sdl_sink_uc.cc		\
+	video_sdl_sink_s.cc
+
+libgnuradio_video_sdl_la_LIBADD =	\
+	$(SDL_LIBS)			\
+	$(GNURADIO_CORE_LA)
+
+libgnuradio_video_sdl_la_LDFLAGS =	\
+	$(NO_UNDEFINED)
+
+if PYTHON
 #################################
 # SWIG interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
 
 TOP_SWIG_IFILES =			\
 	video_sdl.i
@@ -50,15 +62,9 @@ TOP_SWIG_IFILES =			\
 video_sdl_pythondir_category =		\
 	gnuradio
 
-# additional sources for the SWIG-generated library
-video_sdl_la_swig_sources =		\
-	video_sdl_sink_uc.cc		\
-	video_sdl_sink_s.cc
-
 # additional libraries for linking with the SWIG-generated library
 video_sdl_la_swig_libadd =		\
-	$(SDL_LIBS)			\
-	$(GNURADIO_CORE_LA)
+	libgnuradio-video-sdl.la
 
 include $(top_srcdir)/Makefile.swig
 
@@ -67,3 +73,4 @@ BUILT_SOURCES = $(swig_built_sources)
 
 # Do not distribute the output of SWIG
 no_dist_files = $(swig_built_sources)
+endif