summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac4
-rw-r--r--ezdop/src/firmware/Makefile.am23
-rw-r--r--gr-audio-alsa/src/Makefile.am7
-rw-r--r--gr-audio-jack/src/Makefile.am7
-rw-r--r--gr-audio-portaudio/src/Makefile.am4
-rw-r--r--gr-comedi/src/Makefile.am6
-rw-r--r--gr-error-correcting-codes/src/lib/Makefile.am20
-rw-r--r--gr-ezdop/src/lib/Makefile.am4
-rw-r--r--gr-radio-astronomy/src/lib/Makefile.am6
9 files changed, 34 insertions, 47 deletions
diff --git a/configure.ac b/configure.ac
index 8a3e21b2d..9a0c3615f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,7 +162,7 @@ GRC_GR_AUDIO_PORTAUDIO dnl ***NOT TESTED***
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
@@ -170,7 +170,7 @@ GRC_GR_VIDEO_SDL
GRC_GR_WXGUI
GRC_PMT
GRC_GR_TRELLIS
-GRC_EZDOP
+#GRC_EZDOP
GRC_GR_EZDOP dnl this must come after GRC_EZDOP
dnl Has list of successfully configured components
diff --git a/ezdop/src/firmware/Makefile.am b/ezdop/src/firmware/Makefile.am
index 6cb674811..e619deb9f 100644
--- a/ezdop/src/firmware/Makefile.am
+++ b/ezdop/src/firmware/Makefile.am
@@ -28,33 +28,22 @@ OBJCOPY=$(AVROBJCOPY)
# 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
-
-%.hex: %.elf
- $(OBJCOPY) -O ihex -R .eeprom $< $@
+include_HEADERS = dopctrl.h
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
diff --git a/gr-audio-alsa/src/Makefile.am b/gr-audio-alsa/src/Makefile.am
index b6a8ef388..17762342c 100644
--- a/gr-audio-alsa/src/Makefile.am
+++ b/gr-audio-alsa/src/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST = run_tests.in
TESTS = run_tests
LOCAL_IFILES = \
- audio_alsa.i
+ $(top_srcdir)/gr-audio-alsa/src/audio_alsa.i
NON_LOCAL_IFILES = \
$(GNURADIO_I)
@@ -80,9 +80,8 @@ _audio_alsa_la_LIBADD = \
_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
diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am
index 488939a31..f83950954 100644
--- a/gr-audio-jack/src/Makefile.am
+++ b/gr-audio-jack/src/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST = run_tests.in
TESTS = run_tests
LOCAL_IFILES = \
- audio_jack.i
+ $(top_srcdir)/gr-audio-jack/src/audio_jack.i
NON_LOCAL_IFILES = \
$(GNURADIO_I)
@@ -82,9 +82,8 @@ _audio_jack_la_LIBADD = \
_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
diff --git a/gr-audio-portaudio/src/Makefile.am b/gr-audio-portaudio/src/Makefile.am
index 9b59adbb4..5a2188444 100644
--- a/gr-audio-portaudio/src/Makefile.am
+++ b/gr-audio-portaudio/src/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST = run_tests.in
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_LIBADD = \
_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 = \
diff --git a/gr-comedi/src/Makefile.am b/gr-comedi/src/Makefile.am
index b14a7361d..b33a95728 100644
--- a/gr-comedi/src/Makefile.am
+++ b/gr-comedi/src/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST = run_tests.in
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_LIBADD = \
_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 = \
diff --git a/gr-error-correcting-codes/src/lib/Makefile.am b/gr-error-correcting-codes/src/lib/Makefile.am
index ca3c99c68..b5e8905ca 100644
--- a/gr-error-correcting-codes/src/lib/Makefile.am
+++ b/gr-error-correcting-codes/src/lib/Makefile.am
@@ -35,21 +35,21 @@ INCLUDES = $(PYTHON_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES)
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 @@ grinclude_HEADERS = \
# 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 *~
diff --git a/gr-ezdop/src/lib/Makefile.am b/gr-ezdop/src/lib/Makefile.am
index b22d134ec..4f301ec7c 100644
--- a/gr-ezdop/src/lib/Makefile.am
+++ b/gr-ezdop/src/lib/Makefile.am
@@ -50,7 +50,7 @@ NON_LOCAL_IFILES = \
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 @@ _ezdop_la_LIBADD = \
-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 = \
diff --git a/gr-radio-astronomy/src/lib/Makefile.am b/gr-radio-astronomy/src/lib/Makefile.am
index 375c169ae..f670ba423 100644
--- a/gr-radio-astronomy/src/lib/Makefile.am
+++ b/gr-radio-astronomy/src/lib/Makefile.am
@@ -40,7 +40,7 @@ NON_LOCAL_IFILES = \
$(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 @@ _ra_la_LIBADD = \
$(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 =
generated by cgit (git 2.34.1) at 2025-03-30 10:02:06 +0000