[Commit-gnuradio] r11139 - in gnuradio/branches/developers/jcorgan/np: config gr-comedi gr-comedi/src

[jcorgan]

Author: jcorgan
Date: 2009-05-26 16:54:15 -0600 (Tue, 26 May 2009)
New Revision: 11139

Added:
   gnuradio/branches/developers/jcorgan/np/gr-comedi/gnuradio-comedi.pc.in
Modified:
   gnuradio/branches/developers/jcorgan/np/config/grc_gr_comedi.m4
   gnuradio/branches/developers/jcorgan/np/gr-comedi/Makefile.am
   gnuradio/branches/developers/jcorgan/np/gr-comedi/src/Makefile.am
Log:
Split out C++ API library for gr-comedi, untested

Modified: gnuradio/branches/developers/jcorgan/np/config/grc_gr_comedi.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/np/config/grc_gr_comedi.m4     
2009-05-26 21:44:58 UTC (rev 11138)
+++ gnuradio/branches/developers/jcorgan/np/config/grc_gr_comedi.m4     
2009-05-26 22:54:15 UTC (rev 11139)
@@ -35,6 +35,7 @@
 
     AC_CONFIG_FILES([ \
         gr-comedi/Makefile \
+       gr-comedi/gnuradio-comedi.pc \
         gr-comedi/src/Makefile \
         gr-comedi/src/run_tests \
     ])

Modified: gnuradio/branches/developers/jcorgan/np/gr-comedi/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-comedi/Makefile.am       
2009-05-26 21:44:58 UTC (rev 11138)
+++ gnuradio/branches/developers/jcorgan/np/gr-comedi/Makefile.am       
2009-05-26 22:54:15 UTC (rev 11139)
@@ -22,3 +22,6 @@
 include $(top_srcdir)/Makefile.common
 
 SUBDIRS = src
+
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-comedi.pc

Added: gnuradio/branches/developers/jcorgan/np/gr-comedi/gnuradio-comedi.pc.in
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-comedi/gnuradio-comedi.pc.in     
                        (rev 0)
+++ gnuradio/branches/developers/jcorgan/np/gr-comedi/gnuradio-comedi.pc.in     
2009-05-26 22:54:15 UTC (rev 11139)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: gnuradio-comedi
+Description: GNU Radio blocks for the comedi library
+Requires: gnuradio-core
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-comedi
+Cflags: -I${includedir}

Modified: gnuradio/branches/developers/jcorgan/np/gr-comedi/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-comedi/src/Makefile.am   
2009-05-26 21:44:58 UTC (rev 11138)
+++ gnuradio/branches/developers/jcorgan/np/gr-comedi/src/Makefile.am   
2009-05-26 22:54:15 UTC (rev 11139)
@@ -25,7 +25,6 @@
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-if PYTHON
 # C/C++ headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =            \
        comedi_sink_s.h         \
@@ -37,6 +36,21 @@
 noinst_PYTHON =                        \
        qa_comedi.py
 
+lib_LTLIBRARIES = libgnuradio-comedi.la
+
+libgnuradio_comedi_la_SOURCES = \
+       comedi_sink.cc          \
+       comedi_source.cc        \
+       gri_comedi.cc
+
+libgnuradio_comedi_la_LIBADD = \
+       $(GNURADIO_CORE_LA)     \
+       $(COMEDI_LIBS)
+
+libgnuradio_comedi_la_LDFLAGS =        \
+       $(NO_UNDEFINED)
+
+if PYTHON
 ###################################
 # SWIG Python interface and library
 TESTS = run_tests
@@ -52,16 +66,9 @@
 comedi_pythondir_category =    \
        gnuradio
 
-# additional sources for the SWIG-generated library
-comedi_la_swig_sources =       \
-       comedi_sink_s.cc        \
-       comedi_source_s.cc      \
-       gri_comedi.cc
-
 # additional libraries for linking with the SWIG-generated library
 comedi_la_swig_libadd =                \
-       $(GNURADIO_CORE_LA)     \
-       $(COMEDI_LIBS)
+       libgnuradio-comedi.la
 
 include $(top_srcdir)/Makefile.swig