[Commit-gnuradio] r11144 - in gnuradio/branches/developers/jcorgan/np: config gr-msdd6000 gr-msdd6000/src

[jcorgan]

Author: jcorgan
Date: 2009-05-26 17:30:05 -0600 (Tue, 26 May 2009)
New Revision: 11144

Added:
   gnuradio/branches/developers/jcorgan/np/gr-msdd6000/gnuradio-msdd6000.pc.in
Modified:
   gnuradio/branches/developers/jcorgan/np/config/grc_gr_msdd6000.m4
   gnuradio/branches/developers/jcorgan/np/gr-msdd6000/
   gnuradio/branches/developers/jcorgan/np/gr-msdd6000/Makefile.am
   gnuradio/branches/developers/jcorgan/np/gr-msdd6000/src/Makefile.am
Log:
Split out C++ API for gr-msdd6000

Modified: gnuradio/branches/developers/jcorgan/np/config/grc_gr_msdd6000.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/np/config/grc_gr_msdd6000.m4   
2009-05-26 23:29:32 UTC (rev 11143)
+++ gnuradio/branches/developers/jcorgan/np/config/grc_gr_msdd6000.m4   
2009-05-26 23:30:05 UTC (rev 11144)
@@ -22,6 +22,7 @@
 
     AC_CONFIG_FILES([\
        gr-msdd6000/Makefile \
+       gr-msdd6000/gnuradio-msdd6000.pc \
        gr-msdd6000/src/Makefile
     ])
 


Property changes on: gnuradio/branches/developers/jcorgan/np/gr-msdd6000
___________________________________________________________________
Modified: svn:ignore
   - Makefile
Makefile.in

   + Makefile
Makefile.in
*.pc


Modified: gnuradio/branches/developers/jcorgan/np/gr-msdd6000/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-msdd6000/Makefile.am     
2009-05-26 23:29:32 UTC (rev 11143)
+++ gnuradio/branches/developers/jcorgan/np/gr-msdd6000/Makefile.am     
2009-05-26 23:30:05 UTC (rev 11144)
@@ -23,3 +23,5 @@
 
 SUBDIRS = src
 
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-msdd6000.pc

Added: 
gnuradio/branches/developers/jcorgan/np/gr-msdd6000/gnuradio-msdd6000.pc.in
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-msdd6000/gnuradio-msdd6000.pc.in 
                        (rev 0)
+++ gnuradio/branches/developers/jcorgan/np/gr-msdd6000/gnuradio-msdd6000.pc.in 
2009-05-26 23:30:05 UTC (rev 11144)
@@ -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-msdd6000/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-msdd6000/src/Makefile.am 
2009-05-26 23:29:32 UTC (rev 11143)
+++ gnuradio/branches/developers/jcorgan/np/gr-msdd6000/src/Makefile.am 
2009-05-26 23:30:05 UTC (rev 11144)
@@ -24,13 +24,25 @@
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
        $(WITH_INCLUDES)
 
-if PYTHON
 # C/C++ headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =                    \
        msdd_source_simple.h            \
        msdd_buffer_copy_behaviors.h    \
        msdd6000.h
 
+lib_LTLIBRARIES = libgnuradio-msdd6000.la
+
+libgnuradio_msdd6000_la_SOURCES =      \
+       msdd_source_simple.cc           \
+       msdd6000.cc
+
+libgnuradio_msdd6000_la_LIBADD =       \
+       $(GNURADIO_CORE_LA)
+
+libgnuradio_msdd6000_la_LDFLAGS =      \
+       $(NO_UNDEFINED)
+
+if PYTHON
 #################################
 # SWIG interface and library
 
@@ -44,14 +56,9 @@
 msdd_pythondir_category =              \
        gnuradio
 
-# additional sources for the SWIG-generated library
-msdd_la_swig_sources =                 \
-       msdd_source_simple.cc           \
-       msdd6000.cc
-
 # additional libraries for linking with the SWIG-generated library
 msdd_la_swig_libadd =                  \
-       $(GNURADIO_CORE_LA)
+       libgnuradio-msdd6000.la
 
 include $(top_srcdir)/Makefile.swig