[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r3318 - in gnuradio/branches/developers/jcorgan/wip: .
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r3318 - in gnuradio/branches/developers/jcorgan/wip: . ezdop/src/firmware gr-audio-alsa/src gr-audio-jack/src gr-audio-portaudio/src gr-comedi/src gr-error-correcting-codes/src/lib gr-ezdop/src/lib gr-radio-astronomy/src/lib |
|
Date: |
Wed, 16 Aug 2006 12:32:13 -0600 (MDT) |
Author: jcorgan
Date: 2006-08-16 12:32:12 -0600 (Wed, 16 Aug 2006)
New Revision: 3318
Modified:
gnuradio/branches/developers/jcorgan/wip/configure.ac
gnuradio/branches/developers/jcorgan/wip/ezdop/src/firmware/Makefile.am
gnuradio/branches/developers/jcorgan/wip/gr-audio-alsa/src/Makefile.am
gnuradio/branches/developers/jcorgan/wip/gr-audio-jack/src/Makefile.am
gnuradio/branches/developers/jcorgan/wip/gr-audio-portaudio/src/Makefile.am
gnuradio/branches/developers/jcorgan/wip/gr-comedi/src/Makefile.am
gnuradio/branches/developers/jcorgan/wip/gr-error-correcting-codes/src/lib/Makefile.am
gnuradio/branches/developers/jcorgan/wip/gr-ezdop/src/lib/Makefile.am
gnuradio/branches/developers/jcorgan/wip/gr-radio-astronomy/src/lib/Makefile.am
Log:
Merged trunk r3288:3317 into jcorgan/wip.
Modified: gnuradio/branches/developers/jcorgan/wip/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/configure.ac 2006-08-16
18:09:58 UTC (rev 3317)
+++ gnuradio/branches/developers/jcorgan/wip/configure.ac 2006-08-16
18:32:12 UTC (rev 3318)
@@ -162,7 +162,7 @@
#GRC_GR_AUDIO_WINDOWS dnl ***NOT TESTED***
#GRC_GR_ATSC
#GRC_GR_COMEDI
-dnl GRC_GR_ERROR_CORRECTING_CODES dnl disabled until fix for ticket:25
+GRC_GR_ERROR_CORRECTING_CODES dnl disabled until fix for ticket:25
#GRC_GR_GSM_FR_VOCODER
#GRC_GR_RADAR
#GRC_GR_RADIO_ASTRONOMY
Modified:
gnuradio/branches/developers/jcorgan/wip/ezdop/src/firmware/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/ezdop/src/firmware/Makefile.am
2006-08-16 18:09:58 UTC (rev 3317)
+++ gnuradio/branches/developers/jcorgan/wip/ezdop/src/firmware/Makefile.am
2006-08-16 18:32:12 UTC (rev 3318)
@@ -28,33 +28,22 @@
# What's defined for rest of project not good for avr-gcc (no -pthread for
instance)
override CFLAGS=
-noinst_PROGRAMS = \
- dopctrl.elf \
- dopctrl.hex
+noinst_PROGRAMS = dopctrl.elf dopctrl.hex
EXTRA_DIST = \
dopctrl.hex
-dopctrl_elf_CFLAGS=-mmcu=atmega8 -funsigned-char -funsigned-bitfields \
- -fpack-struct -fshort-enums -Wall -Wstrict-prototypes \
- -Wa,-adhlns=$(<:.c=.lst)
+dopctrl_elf_CFLAGS=-mmcu=atmega8 -funsigned-char -funsigned-bitfields
-fpack-struct -fshort-enums -Wall -Wstrict-prototypes -Wa,-adhlns=$(<:.c=.lst)
-dopctrl_elf_SOURCES = \
- dopctrl.c
+dopctrl_elf_SOURCES = dopctrl.c
-#dopctrl_elfdir = $(includedir)
+include_HEADERS = dopctrl.h
-include_HEADERS = \
- dopctrl.h
-
-%.hex: %.elf
- $(OBJCOPY) -O ihex -R .eeprom $< $@
-
dopctrl.hex : dopctrl.elf
-
+ $(OBJCOPY) -O ihex -R .eeprom dopctrl.elf dopctrl.hex
+
install-data-local:
$(INSTALL_DATA) -D $(top_builddir)/ezdop/src/firmware/dopctrl.hex
$(DESTDIR)$(datadir)/dopctrl.hex
uninstall-local:
$(RM) $(DESTDIR)$(datadir)/dopctrl.hex
-
\ No newline at end of file
Modified: gnuradio/branches/developers/jcorgan/wip/gr-audio-alsa/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/gr-audio-alsa/src/Makefile.am
2006-08-16 18:09:58 UTC (rev 3317)
+++ gnuradio/branches/developers/jcorgan/wip/gr-audio-alsa/src/Makefile.am
2006-08-16 18:32:12 UTC (rev 3318)
@@ -33,7 +33,7 @@
TESTS = run_tests
LOCAL_IFILES = \
- audio_alsa.i
+ $(top_srcdir)/gr-audio-alsa/src/audio_alsa.i
NON_LOCAL_IFILES = \
$(GNURADIO_I)
@@ -80,10 +80,9 @@
_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
-audio_alsa.cc audio_alsa.py: audio_alsa.i $(NON_LOCAL_IFILES)
- $(SWIG) $(SWIGPYTHONARGS) -module audio_alsa -o audio_alsa.cc $<
+audio_alsa.cc audio_alsa.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
+ $(SWIG) $(SWIGPYTHONARGS) -module audio_alsa -o audio_alsa.cc
$(LOCAL_IFILES)
-
noinst_PYTHON = \
qa_alsa.py
Modified: gnuradio/branches/developers/jcorgan/wip/gr-audio-jack/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/gr-audio-jack/src/Makefile.am
2006-08-16 18:09:58 UTC (rev 3317)
+++ gnuradio/branches/developers/jcorgan/wip/gr-audio-jack/src/Makefile.am
2006-08-16 18:32:12 UTC (rev 3318)
@@ -33,7 +33,7 @@
TESTS = run_tests
LOCAL_IFILES = \
- audio_jack.i
+ $(top_srcdir)/gr-audio-jack/src/audio_jack.i
NON_LOCAL_IFILES = \
$(GNURADIO_I)
@@ -82,10 +82,9 @@
_audio_jack_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
-audio_jack.cc audio_jack.py: audio_jack.i $(NON_LOCAL_IFILES)
- $(SWIG) $(SWIGPYTHONARGS) -module audio_jack -o audio_jack.cc $<
+audio_jack.cc audio_jack.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
+ $(SWIG) $(SWIGPYTHONARGS) -module audio_jack -o audio_jack.cc
$(LOCAL_IFILES)
-
noinst_PYTHON = \
qa_jack.py
Modified:
gnuradio/branches/developers/jcorgan/wip/gr-audio-portaudio/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/gr-audio-portaudio/src/Makefile.am
2006-08-16 18:09:58 UTC (rev 3317)
+++ gnuradio/branches/developers/jcorgan/wip/gr-audio-portaudio/src/Makefile.am
2006-08-16 18:32:12 UTC (rev 3318)
@@ -33,7 +33,7 @@
TESTS = run_tests
LOCAL_IFILES = \
- audio_portaudio.i
+ $(top_srcdir)/gr-audio-portaudio/src/audio_portaudio.i
NON_LOCAL_IFILES = \
$(GNURADIO_I)
@@ -82,7 +82,7 @@
_audio_portaudio_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
audio_portaudio.cc audio_portaudio.py: $(ALL_IFILES) audio_portaudio_sink.h
audio_portaudio_source.h
- $(SWIG) $(SWIGPYTHONARGS) -module audio_portaudio -o audio_portaudio.cc
$<
+ $(SWIG) $(SWIGPYTHONARGS) -module audio_portaudio -o audio_portaudio.cc
$(LOCAL_IFILES)
noinst_PYTHON = \
Modified: gnuradio/branches/developers/jcorgan/wip/gr-comedi/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/gr-comedi/src/Makefile.am
2006-08-16 18:09:58 UTC (rev 3317)
+++ gnuradio/branches/developers/jcorgan/wip/gr-comedi/src/Makefile.am
2006-08-16 18:32:12 UTC (rev 3318)
@@ -33,7 +33,7 @@
TESTS = run_tests
LOCAL_IFILES = \
- comedi.i
+ $(top_srcdir)/gr-comedi/src/comedi.i
NON_LOCAL_IFILES = \
$(GNURADIO_I)
@@ -81,8 +81,8 @@
_comedi_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
-comedi.cc comedi.py: comedi.i
- $(SWIG) $(SWIGCPPPYTHONARGS) -module comedi -o comedi.cc $<
+comedi.cc comedi.py: $(LOCAL_IFILES)
+ $(SWIG) $(SWIGCPPPYTHONARGS) -module comedi -o comedi.cc $(LOCAL_IFILES)
noinst_PYTHON = \
Modified:
gnuradio/branches/developers/jcorgan/wip/gr-error-correcting-codes/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/wip/gr-error-correcting-codes/src/lib/Makefile.am
2006-08-16 18:09:58 UTC (rev 3317)
+++
gnuradio/branches/developers/jcorgan/wip/gr-error-correcting-codes/src/lib/Makefile.am
2006-08-16 18:32:12 UTC (rev 3318)
@@ -35,21 +35,21 @@
SWIGCPPPYTHONARGS = -fvirtual -python -modern $(PYTHON_CPPFLAGS) \
$(STD_DEFINES_AND_INCLUDES)
-ALL_IFILES = $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
-
NON_LOCAL_IFILES = $(GNURADIO_I)
-LOCAL_IFILES = \
- ecc_syms_to_metrics.i \
- ecc_metrics_decode_viterbi_full_block.i \
- ecc_streams_encode_convolutional.i \
- ecc_streams_encode_turbo.i \
- ecc.i
+LOCAL_IFILES = \
+ $(top_srcdir)/gr-error-correcting-codes/src/lib/ecc_syms_to_metrics.i \
+
$(top_srcdir)/gr-error-correcting-codes/src/lib/ecc_metrics_decode_viterbi_full_block.i
\
+
$(top_srcdir)/gr-error-correcting-codes/src/lib/ecc_streams_encode_convolutional.i
\
+
$(top_srcdir)/gr-error-correcting-codes/src/lib/ecc_streams_encode_turbo.i
\
+ $(top_srcdir)/gr-error-correcting-codes/src/lib/ecc.i
# These files are built by SWIG. The first is the C++ glue.
# The second is the python wrapper that loads the _howto shared library
# and knows how to call our extensions.
+ALL_IFILES = $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
+
BUILT_SOURCES = \
ecc.cc \
ecc.py
@@ -89,8 +89,8 @@
# These swig headers get installed in ${prefix}/include/gnuradio/swig
swiginclude_HEADERS = $(LOCAL_IFILES)
-ecc.cc ecc.py: ecc.i $(ALL_IFILES)
- $(SWIG) $(SWIGCPPPYTHONARGS) -module ecc -o ecc.cc $<
+ecc.cc ecc.py: $(top_srcdir)/gr-error-correcting-codes/src/lib/ecc.i
$(ALL_IFILES)
+ $(SWIG) $(SWIGCPPPYTHONARGS) -module ecc -o ecc.cc
$(top_srcdir)/gr-error-correcting-codes/src/lib/ecc.i
MOSTLYCLEANFILES = $(BUILT_SOURCES) *.pyc *.loT *~
Modified: gnuradio/branches/developers/jcorgan/wip/gr-ezdop/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/gr-ezdop/src/lib/Makefile.am
2006-08-16 18:09:58 UTC (rev 3317)
+++ gnuradio/branches/developers/jcorgan/wip/gr-ezdop/src/lib/Makefile.am
2006-08-16 18:32:12 UTC (rev 3318)
@@ -50,7 +50,7 @@
LOCAL_IFILES = \
- ezdop.i
+ $(top_srcdir)/gr-ezdop/src/lib/ezdop.i
# These files are built by SWIG. The first is the C++ glue.
# The second is the python wrapper that loads the _ezdop shared library
@@ -83,7 +83,7 @@
-lstdc++
ezdop.cc ezdop.py: $(ALL_IFILES)
- $(SWIG) $(SWIGPYTHONARGS) -module ezdop -o ezdop.cc $<
+ $(SWIG) $(SWIGPYTHONARGS) -module ezdop -o ezdop.cc $(LOCAL_IFILES)
# These headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
Modified:
gnuradio/branches/developers/jcorgan/wip/gr-radio-astronomy/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/wip/gr-radio-astronomy/src/lib/Makefile.am
2006-08-16 18:09:58 UTC (rev 3317)
+++
gnuradio/branches/developers/jcorgan/wip/gr-radio-astronomy/src/lib/Makefile.am
2006-08-16 18:32:12 UTC (rev 3318)
@@ -40,7 +40,7 @@
$(GNURADIO_I)
LOCAL_IFILES = \
- ra.i
+ $(top_srcdir)/gr-radio-astronomy/src/lib/ra.i
# These files are built by SWIG. The first is the C++ glue.
# The second is the python wrapper that loads the _howto shared library
@@ -70,8 +70,8 @@
$(GNURADIO_CORE_LIBS) \
-lstdc++
-ra.cc ra.py: ra.i $(ALL_IFILES)
- $(SWIG) $(SWIGPYTHONARGS) -module ra -o ra.cc $<
+ra.cc ra.py: $(ALL_IFILES)
+ $(SWIG) $(SWIGPYTHONARGS) -module ra -o ra.cc $(LOCAL_IFILES)
# These headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS =
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r3318 - in gnuradio/branches/developers/jcorgan/wip: . ezdop/src/firmware gr-audio-alsa/src gr-audio-jack/src gr-audio-portaudio/src gr-comedi/src gr-error-correcting-codes/src/lib gr-ezdop/src/lib gr-radio-astronomy/src/lib,
jcorgan <=