[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4649 - in gnuradio/branches/releases/3.0: . gnuradio-
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r4649 - in gnuradio/branches/releases/3.0: . gnuradio-core/src/lib gnuradio-core/src/lib/swig gnuradio-core/src/tests gr-audio-alsa/src gr-audio-jack/src gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-gsm-fr-vocoder/src/lib gr-radio-astronomy/src/lib gr-trellis/src/lib gr-usrp/src gr-video-sdl/src |
|
Date: |
Mon, 26 Feb 2007 15:23:01 -0700 (MST) |
Author: jcorgan
Date: 2007-02-26 15:23:01 -0700 (Mon, 26 Feb 2007)
New Revision: 4649
Modified:
gnuradio/branches/releases/3.0/Makefile.common
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/Makefile.am
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/swig/Makefile.am
gnuradio/branches/releases/3.0/gnuradio-core/src/tests/Makefile.am
gnuradio/branches/releases/3.0/gr-audio-alsa/src/Makefile.am
gnuradio/branches/releases/3.0/gr-audio-jack/src/Makefile.am
gnuradio/branches/releases/3.0/gr-audio-oss/src/Makefile.am
gnuradio/branches/releases/3.0/gr-audio-osx/src/Makefile.am
gnuradio/branches/releases/3.0/gr-audio-portaudio/src/Makefile.am
gnuradio/branches/releases/3.0/gr-audio-windows/src/Makefile.am
gnuradio/branches/releases/3.0/gr-gsm-fr-vocoder/src/lib/Makefile.am
gnuradio/branches/releases/3.0/gr-radio-astronomy/src/lib/Makefile.am
gnuradio/branches/releases/3.0/gr-trellis/src/lib/Makefile.am
gnuradio/branches/releases/3.0/gr-usrp/src/Makefile.am
gnuradio/branches/releases/3.0/gr-video-sdl/src/Makefile.am
Log:
Applied changeset r4645:4646 on trunk to release branch, with edits.
Modified: gnuradio/branches/releases/3.0/Makefile.common
===================================================================
--- gnuradio/branches/releases/3.0/Makefile.common 2007-02-26 21:35:42 UTC
(rev 4648)
+++ gnuradio/branches/releases/3.0/Makefile.common 2007-02-26 22:23:01 UTC
(rev 4649)
@@ -1,6 +1,6 @@
# -*- Makefile -*-
#
-# Copyright 2004,2006 Free Software Foundation, Inc.
+# Copyright 2004,2006,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -51,26 +51,17 @@
-I$(top_builddir)/gnuradio-core/src/lib/swig \
$(FFTW3F_CFLAGS)
+# How to link in GNU Radio core library from inside the tree
+GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la
-# These used to be set in PKGCONFIG but now point to the current
-# build tree.
-GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \
- -lgnuradio-core -lfftw3f -lm
-
# This is a dependency for many swig operations
GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
-# The below used to be set in PKGCONFIG but now point to the current
-# build tree.
+# How to link in the USRP library from inside the tree
USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \
-I$(top_srcdir)/usrp/firmware/include
+USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la
-USRP_LIBS = -L$(top_builddir)/usrp/host/lib \
- -lusrp
-
-PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib
-PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt
-
# This used to be set in configure.ac but is now defined here for all
# Makefiles when this fragment is included.
STD_DEFINES_AND_INCLUDES=$(DEFINES) $(GNURADIO_INCLUDES) $(BOOST_CFLAGS)
Modified: gnuradio/branches/releases/3.0/gnuradio-core/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/gnuradio-core/src/lib/Makefile.am
2007-02-26 21:35:42 UTC (rev 4648)
+++ gnuradio/branches/releases/3.0/gnuradio-core/src/lib/Makefile.am
2007-02-26 22:23:01 UTC (rev 4649)
@@ -36,7 +36,6 @@
libgnuradio_core_qa_la_SOURCES = bug_work_around_6.cc
libgnuradio_core_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 \
$(LIBGNURADIO_CORE_EXTRA_LDFLAGS)
-
libgnuradio_core_la_LIBADD = \
filter/libfilter.la \
g72x/libccitt.la \
Modified: gnuradio/branches/releases/3.0/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/gnuradio-core/src/lib/swig/Makefile.am
2007-02-26 21:35:42 UTC (rev 4648)
+++ gnuradio/branches/releases/3.0/gnuradio-core/src/lib/swig/Makefile.am
2007-02-26 22:23:01 UTC (rev 4649)
@@ -68,7 +68,7 @@
_gnuradio_swig_python_la_LIBADD = \
- $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la \
+ $(GNURADIO_CORE_LA) \
$(PYTHON_LDFLAGS) \
-lstdc++
Modified: gnuradio/branches/releases/3.0/gnuradio-core/src/tests/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/gnuradio-core/src/tests/Makefile.am
2007-02-26 21:35:42 UTC (rev 4648)
+++ gnuradio/branches/releases/3.0/gnuradio-core/src/tests/Makefile.am
2007-02-26 22:23:01 UTC (rev 4649)
@@ -33,7 +33,7 @@
#Test program to test setting up buffers using gr_test which can be run
manually
EXTRA_DIST = \
test_buffers.py
-
+
noinst_PROGRAMS = \
benchmark_dotprod \
benchmark_dotprod_fsf \
@@ -50,7 +50,7 @@
test_vmcircbuf
-LIBGNURADIO = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la
+LIBGNURADIO = $(GNURADIO_CORE_LA)
LIBGNURADIOQA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core-qa.la
$(LIBGNURADIO)
benchmark_dotprod_SOURCES = benchmark_dotprod.cc
Modified: gnuradio/branches/releases/3.0/gr-audio-alsa/src/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/gr-audio-alsa/src/Makefile.am
2007-02-26 21:35:42 UTC (rev 4648)
+++ gnuradio/branches/releases/3.0/gr-audio-alsa/src/Makefile.am
2007-02-26 22:23:01 UTC (rev 4649)
@@ -74,7 +74,7 @@
_audio_alsa_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
$(ALSA_LIBS) \
-lstdc++
Modified: gnuradio/branches/releases/3.0/gr-audio-jack/src/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/gr-audio-jack/src/Makefile.am
2007-02-26 21:35:42 UTC (rev 4648)
+++ gnuradio/branches/releases/3.0/gr-audio-jack/src/Makefile.am
2007-02-26 22:23:01 UTC (rev 4649)
@@ -76,7 +76,7 @@
_audio_jack_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
$(JACK_LIBS) \
-lstdc++
Modified: gnuradio/branches/releases/3.0/gr-audio-oss/src/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/gr-audio-oss/src/Makefile.am 2007-02-26
21:35:42 UTC (rev 4648)
+++ gnuradio/branches/releases/3.0/gr-audio-oss/src/Makefile.am 2007-02-26
22:23:01 UTC (rev 4649)
@@ -69,7 +69,7 @@
_audio_oss_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
$(OSS_LIBS) \
-lstdc++
Modified: gnuradio/branches/releases/3.0/gr-audio-osx/src/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/gr-audio-osx/src/Makefile.am 2007-02-26
21:35:42 UTC (rev 4648)
+++ gnuradio/branches/releases/3.0/gr-audio-osx/src/Makefile.am 2007-02-26
22:23:01 UTC (rev 4649)
@@ -73,7 +73,7 @@
_audio_osx_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
-lstdc++
_audio_osx_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version -framework
AudioUnit -framework CoreAudio -framework AudioToolbox
Modified: gnuradio/branches/releases/3.0/gr-audio-portaudio/src/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/gr-audio-portaudio/src/Makefile.am
2007-02-26 21:35:42 UTC (rev 4648)
+++ gnuradio/branches/releases/3.0/gr-audio-portaudio/src/Makefile.am
2007-02-26 22:23:01 UTC (rev 4649)
@@ -75,7 +75,7 @@
_audio_portaudio_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
$(PORTAUDIO_LIBS) \
-lstdc++
Modified: gnuradio/branches/releases/3.0/gr-audio-windows/src/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/gr-audio-windows/src/Makefile.am
2007-02-26 21:35:42 UTC (rev 4648)
+++ gnuradio/branches/releases/3.0/gr-audio-windows/src/Makefile.am
2007-02-26 22:23:01 UTC (rev 4649)
@@ -69,7 +69,7 @@
_audio_windows_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
$(WINAUDIO_LIBS) \
-lstdc++
Modified: gnuradio/branches/releases/3.0/gr-gsm-fr-vocoder/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/gr-gsm-fr-vocoder/src/lib/Makefile.am
2007-02-26 21:35:42 UTC (rev 4648)
+++ gnuradio/branches/releases/3.0/gr-gsm-fr-vocoder/src/lib/Makefile.am
2007-02-26 22:23:01 UTC (rev 4649)
@@ -76,7 +76,7 @@
_gsm_full_rate_la_LIBADD = \
gsm/libgsm.la \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
-lstdc++
gsm_full_rate.cc gsm_full_rate.py: gsm_full_rate.i $(ALL_IFILES)
Modified: gnuradio/branches/releases/3.0/gr-radio-astronomy/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/gr-radio-astronomy/src/lib/Makefile.am
2007-02-26 21:35:42 UTC (rev 4648)
+++ gnuradio/branches/releases/3.0/gr-radio-astronomy/src/lib/Makefile.am
2007-02-26 22:23:01 UTC (rev 4649)
@@ -65,9 +65,9 @@
# link the library against some comon swig runtime code and the
# c++ standard library
-_ra_la_LIBADD = \
- $(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+_ra_la_LIBADD = \
+ $(PYTHON_LDFLAGS) \
+ $(GNURADIO_CORE_LA) \
-lstdc++
ra.cc ra.py: $(ALL_IFILES)
Modified: gnuradio/branches/releases/3.0/gr-trellis/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/gr-trellis/src/lib/Makefile.am
2007-02-26 21:35:42 UTC (rev 4648)
+++ gnuradio/branches/releases/3.0/gr-trellis/src/lib/Makefile.am
2007-02-26 22:23:01 UTC (rev 4649)
@@ -80,7 +80,7 @@
# c++ standard library
_trellis_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
-lstdc++
trellis.cc trellis.py: $(ALL_IFILES) $(grinclude_HEADERS)
Modified: gnuradio/branches/releases/3.0/gr-usrp/src/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/gr-usrp/src/Makefile.am 2007-02-26
21:35:42 UTC (rev 4648)
+++ gnuradio/branches/releases/3.0/gr-usrp/src/Makefile.am 2007-02-26
22:23:01 UTC (rev 4649)
@@ -94,8 +94,8 @@
_usrp1_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
- $(USRP_LIBS) \
+ $(GNURADIO_CORE_LA) \
+ $(USRP_LA) \
-lstdc++
Modified: gnuradio/branches/releases/3.0/gr-video-sdl/src/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/gr-video-sdl/src/Makefile.am 2007-02-26
21:35:42 UTC (rev 4648)
+++ gnuradio/branches/releases/3.0/gr-video-sdl/src/Makefile.am 2007-02-26
22:23:01 UTC (rev 4649)
@@ -69,7 +69,7 @@
_video_sdl_la_LIBADD = \
$(PYTHON_LDFLAGS) \
- $(GNURADIO_CORE_LIBS) \
+ $(GNURADIO_CORE_LA) \
$(SDL_LIBS) \
-lstdc++
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4649 - in gnuradio/branches/releases/3.0: . gnuradio-core/src/lib gnuradio-core/src/lib/swig gnuradio-core/src/tests gr-audio-alsa/src gr-audio-jack/src gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-gsm-fr-vocoder/src/lib gr-radio-astronomy/src/lib gr-trellis/src/lib gr-usrp/src gr-video-sdl/src,
jcorgan <=