[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r11146 - in gnuradio/branches/developers/jcorgan/np: c
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r11146 - in gnuradio/branches/developers/jcorgan/np: config gr-trellis gr-trellis/src/lib gr-video-sdl gr-video-sdl/src |
|
Date: |
Tue, 26 May 2009 18:03:51 -0600 (MDT) |
Author: jcorgan
Date: 2009-05-26 18:03:51 -0600 (Tue, 26 May 2009)
New Revision: 11146
Added:
gnuradio/branches/developers/jcorgan/np/gr-trellis/gnuradio-trellis.pc.in
gnuradio/branches/developers/jcorgan/np/gr-video-sdl/gnuradio-video-sdl.pc.in
Modified:
gnuradio/branches/developers/jcorgan/np/config/grc_gr_trellis.m4
gnuradio/branches/developers/jcorgan/np/config/grc_gr_video_sdl.m4
gnuradio/branches/developers/jcorgan/np/gr-trellis/
gnuradio/branches/developers/jcorgan/np/gr-trellis/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-trellis/src/lib/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-video-sdl/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-video-sdl/src/Makefile.am
Log:
Split out C++ API libraries for gr-trellis and gr-video-sdl
Modified: gnuradio/branches/developers/jcorgan/np/config/grc_gr_trellis.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/np/config/grc_gr_trellis.m4
2009-05-26 23:40:53 UTC (rev 11145)
+++ gnuradio/branches/developers/jcorgan/np/config/grc_gr_trellis.m4
2009-05-27 00:03:51 UTC (rev 11146)
@@ -25,6 +25,7 @@
AC_CONFIG_FILES([\
gr-trellis/Makefile \
+ gr-trellis/gnuradio-trellis.pc \
gr-trellis/doc/Makefile \
gr-trellis/src/Makefile \
gr-trellis/src/lib/Makefile \
Modified: gnuradio/branches/developers/jcorgan/np/config/grc_gr_video_sdl.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/np/config/grc_gr_video_sdl.m4
2009-05-26 23:40:53 UTC (rev 11145)
+++ gnuradio/branches/developers/jcorgan/np/config/grc_gr_video_sdl.m4
2009-05-27 00:03:51 UTC (rev 11146)
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009 Free Software
Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
@@ -37,6 +37,7 @@
AC_CONFIG_FILES([ \
gr-video-sdl/Makefile \
+ gr-video-sdl/gnuradio-video-sdl.pc \
gr-video-sdl/src/Makefile \
gr-video-sdl/src/run_tests \
])
Property changes on: gnuradio/branches/developers/jcorgan/np/gr-trellis
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
aclocal.m4
configure
config.h.in
stamp-h.in
libtool
config.log
config.h
config.cache
config.status
missing
stamp-h
stamp-h1
.deps
.libs
*.la
*.lo
autom4te.cache
*.cache
missing
make.log
+ Makefile
Makefile.in
aclocal.m4
configure
config.h.in
stamp-h.in
libtool
config.log
config.h
config.cache
config.status
missing
stamp-h
stamp-h1
.deps
.libs
*.la
*.lo
autom4te.cache
*.cache
missing
make.log
*.pc
Modified: gnuradio/branches/developers/jcorgan/np/gr-trellis/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-trellis/Makefile.am
2009-05-26 23:40:53 UTC (rev 11145)
+++ gnuradio/branches/developers/jcorgan/np/gr-trellis/Makefile.am
2009-05-27 00:03:51 UTC (rev 11146)
@@ -23,3 +23,5 @@
SUBDIRS = src doc
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-trellis.pc
Added: gnuradio/branches/developers/jcorgan/np/gr-trellis/gnuradio-trellis.pc.in
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-trellis/gnuradio-trellis.pc.in
(rev 0)
+++ gnuradio/branches/developers/jcorgan/np/gr-trellis/gnuradio-trellis.pc.in
2009-05-27 00:03:51 UTC (rev 11146)
@@ -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-trellis/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-trellis/src/lib/Makefile.am
2009-05-26 23:40:53 UTC (rev 11145)
+++ gnuradio/branches/developers/jcorgan/np/gr-trellis/src/lib/Makefile.am
2009-05-27 00:03:51 UTC (rev 11146)
@@ -23,7 +23,6 @@
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
-if PYTHON
# ----------------------------------------------------------------
# these scripts generate trellis codes from template files
@@ -67,6 +66,29 @@
trellis_siso_combined_f.h \
$(GENERATED_H)
+lib_LTLIBRARIES = libgnuradio-trellis.la
+
+libgnuradio_trellis_la_SOURCES = \
+ fsm.cc \
+ quicksort_index.cc \
+ base.cc \
+ interleaver.cc \
+ trellis_calc_metric.cc \
+ trellis_permutation.cc \
+ trellis_siso_f.cc \
+ trellis_siso_combined_f.cc \
+ $(GENERATED_CC)
+
+libgnuradio_trellis_la_LIBADD = \
+ $(GNURADIO_CORE_LA)
+
+libgnuradio_trellis_la_LDFLAGS = \
+ $(NO_UNDEFINED)
+
+
+
+
+if PYTHON
#################################
# SWIG interface and library
@@ -80,21 +102,9 @@
trellis_pythondir_category = \
gnuradio
-# additional sources for the SWIG-generated library
-trellis_la_swig_sources = \
- fsm.cc \
- quicksort_index.cc \
- base.cc \
- interleaver.cc \
- trellis_calc_metric.cc \
- trellis_permutation.cc \
- trellis_siso_f.cc \
- trellis_siso_combined_f.cc \
- $(GENERATED_CC)
-
# additional libraries for linking with the SWIG-generated library
trellis_la_swig_libadd = \
- $(GNURADIO_CORE_LA)
+ libgnuradio-trellis.la
# additional SWIG files to be installed
trellis_swiginclude_headers = \
Modified: gnuradio/branches/developers/jcorgan/np/gr-video-sdl/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-video-sdl/Makefile.am
2009-05-26 23:40:53 UTC (rev 11145)
+++ gnuradio/branches/developers/jcorgan/np/gr-video-sdl/Makefile.am
2009-05-27 00:03:51 UTC (rev 11146)
@@ -22,3 +22,6 @@
include $(top_srcdir)/Makefile.common
SUBDIRS = src
+
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-video-sdl.pc
Added:
gnuradio/branches/developers/jcorgan/np/gr-video-sdl/gnuradio-video-sdl.pc.in
===================================================================
---
gnuradio/branches/developers/jcorgan/np/gr-video-sdl/gnuradio-video-sdl.pc.in
(rev 0)
+++
gnuradio/branches/developers/jcorgan/np/gr-video-sdl/gnuradio-video-sdl.pc.in
2009-05-27 00:03:51 UTC (rev 11146)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+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}
Modified: gnuradio/branches/developers/jcorgan/np/gr-video-sdl/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-video-sdl/src/Makefile.am
2009-05-26 23:40:53 UTC (rev 11145)
+++ gnuradio/branches/developers/jcorgan/np/gr-video-sdl/src/Makefile.am
2009-05-27 00:03:51 UTC (rev 11146)
@@ -26,7 +26,6 @@
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS) \
$(WITH_INCLUDES)
-if PYTHON
noinst_PYTHON = \
qa_video_sdl.py
@@ -34,6 +33,20 @@
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
@@ -49,15 +62,9 @@
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
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r11146 - in gnuradio/branches/developers/jcorgan/np: config gr-trellis gr-trellis/src/lib gr-video-sdl gr-video-sdl/src,
jcorgan <=