Skip to content

Commit 67d0b6b

Browse files
trondeautrondeau
committed
docs: fixes some warnings.
There is way too much institutional knowledge in these makefiles now. Another reason I'm glad we're going to cmake, which is being kept more sane as all of the problems are already known.
1 parent 839e2ef commit 67d0b6b

File tree

12 files changed

+44
-41
lines changed

12 files changed

+44
-41
lines changed

‎gnuradio-core/src/lib/swig/Makefile.am

+8-8
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,14 @@ AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
3232
# X86_64, g++'s resident set size was 650MB!
3333
# ----------------------------------------------------------------
3434

35+
TOP_SWIG_DOC_IFILES = \
36+
filter_swig_doc.i \
37+
general_swig_doc.i \
38+
gengen_swig_doc.i \
39+
hier_swig_doc.i \
40+
io_swig_doc.i \
41+
runtime_swig_doc.i
42+
3543
TOP_SWIG_IFILES = \
3644
$(TOP_SWIG_DOC_IFILES) \
3745
gnuradio_core_runtime.i \
@@ -41,14 +49,6 @@ TOP_SWIG_IFILES = \
4149
gnuradio_core_io.i \
4250
gnuradio_core_hier.i
4351

44-
TOP_SWIG_DOC_IFILES = \
45-
filter_swig_doc.i \
46-
general_swig_doc.i \
47-
gengen_swig_doc.i \
48-
hier_swig_doc.i \
49-
io_swig_doc.i \
50-
runtime_swig_doc.i
51-
5252
BUILT_SOURCES += \
5353
$(TOP_SWIG_DOC_IFILES)
5454

‎gr-atsc/src/lib/Makefile.am

+3-3
Original file line numberDiff line numberDiff line change
@@ -222,13 +222,13 @@ CLEANFILES += atsci_viterbi_mux.cc atsci_viterbi_gen$(EXEEXT)
222222
# It builds the atsc modules which we'll load into python or guile
223223
# ------------------------------------------------------------------------
224224

225+
TOP_SWIG_DOC_IFILES = \
226+
atsc_swig_doc.i
227+
225228
TOP_SWIG_IFILES = \
226229
$(TOP_SWIG_DOC_IFILES) \
227230
atsc.i
228231

229-
TOP_SWIG_DOC_IFILES = \
230-
atsc_swig_doc.i
231-
232232
BUILT_SOURCES += \
233233
$(TOP_SWIG_DOC_IFILES)
234234

‎gr-audio/swig/Makefile.am

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ AM_CPPFLAGS = \
3333
# ----------------------------------------------------------------
3434
# The SWIG library
3535

36+
TOP_SWIG_DOC_IFILES = \
37+
audio_swig_doc.i
38+
3639
TOP_SWIG_IFILES = \
3740
$(TOP_SWIG_DOC_IFILES) \
3841
audio_swig.i
3942

40-
TOP_SWIG_DOC_IFILES = \
41-
audio_swig_doc.i
42-
4343
BUILT_SOURCES += \
4444
$(TOP_SWIG_DOC_IFILES)
4545

‎gr-comedi/src/Makefile.am

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ libgnuradio_comedi_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
5656
###################################
5757
# SWIG interfaces and libraries
5858

59+
TOP_SWIG_DOC_IFILES = \
60+
comedi_swig_doc.i
61+
5962
TOP_SWIG_IFILES = \
6063
$(TOP_SWIG_DOC_IFILES) \
6164
comedi.i
6265

63-
TOP_SWIG_DOC_IFILES = \
64-
comedi_swig_doc.i
65-
6666
BUILT_SOURCES += \
6767
$(TOP_SWIG_DOC_IFILES)
6868

‎gr-noaa/swig/Makefile.am

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ AM_CPPFLAGS = \
4242
# The SWIG library
4343
# TESTS = run_tests
4444

45+
TOP_SWIG_DOC_IFILES = \
46+
noaa_swig_doc.i
47+
4548
TOP_SWIG_IFILES = \
4649
$(TOP_SWIG_DOC_IFILES) \
4750
noaa_swig.i
4851

49-
TOP_SWIG_DOC_IFILES = \
50-
noaa_swig_doc.i
51-
5252
BUILT_SOURCES += \
5353
$(TOP_SWIG_DOC_IFILES)
5454

‎gr-pager/swig/Makefile.am

+4-3
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,14 @@ noinst_GUILE = pager.test
4141

4242
##############################
4343
# SWIG interface and library
44-
TOP_SWIG_IFILES = \
45-
$(TOP_SWIG_DOC_IFILES) \
46-
pager_swig.i
4744

4845
TOP_SWIG_DOC_IFILES = \
4946
pager_swig_doc.i
5047

48+
TOP_SWIG_IFILES = \
49+
$(TOP_SWIG_DOC_IFILES) \
50+
pager_swig.i
51+
5152
BUILT_SOURCES += \
5253
$(TOP_SWIG_DOC_IFILES)
5354

‎gr-qtgui/swig/Makefile.am

+4-3
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,14 @@ AM_CPPFLAGS = \
3636

3737
##############################
3838
# SWIG interface and library
39-
TOP_SWIG_IFILES = \
40-
$(TOP_SWIG_DOC_IFILES) \
41-
qtgui_swig.i
4239

4340
TOP_SWIG_DOC_IFILES = \
4441
qtgui_swig_doc.i
4542

43+
TOP_SWIG_IFILES = \
44+
$(TOP_SWIG_DOC_IFILES) \
45+
qtgui_swig.i
46+
4647
BUILT_SOURCES += \
4748
$(TOP_SWIG_DOC_IFILES)
4849

‎gr-shd/swig/Makefile.am

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ endif
4545
# ----------------------------------------------------------------
4646
# The SWIG library
4747

48+
TOP_SWIG_DOC_IFILES = \
49+
shd_swig_doc.i
50+
4851
TOP_SWIG_IFILES = \
4952
$(TOP_SWIG_DOC_IFILES) \
5053
shd_swig.i
5154

52-
TOP_SWIG_DOC_IFILES = \
53-
shd_swig_doc.i
54-
5555
BUILT_SOURCES += \
5656
$(TOP_SWIG_DOC_IFILES)
5757

‎gr-trellis/src/lib/Makefile.am

+3-3
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,13 @@ trellis.py trellis.scm: trellis_generated.i
121121
#################################
122122
# SWIG interface and library
123123

124+
TOP_SWIG_DOC_IFILES = \
125+
trellis_swig_doc.i
126+
124127
TOP_SWIG_IFILES = \
125128
$(TOP_SWIG_DOC_IFILES) \
126129
trellis.i
127130

128-
TOP_SWIG_DOC_IFILES = \
129-
trellis_swig_doc.i
130-
131131
BUILT_SOURCES += \
132132
$(TOP_SWIG_DOC_IFILES)
133133

‎gr-uhd/swig/Makefile.am

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ endif
4545
# ----------------------------------------------------------------
4646
# The SWIG library
4747

48+
TOP_SWIG_DOC_IFILES = \
49+
uhd_swig_doc.i
50+
4851
TOP_SWIG_IFILES = \
4952
$(TOP_SWIG_DOC_IFILES) \
5053
uhd_swig.i
5154

52-
TOP_SWIG_DOC_IFILES = \
53-
uhd_swig_doc.i
54-
5555
BUILT_SOURCES += \
5656
$(TOP_SWIG_DOC_IFILES)
5757

‎gr-video-sdl/src/Makefile.am

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ libgnuradio_video_sdl_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
5353
#################################
5454
# SWIG interfaces and libraries
5555

56+
TOP_SWIG_DOC_IFILES = \
57+
video_sdl_swig_doc.i
58+
5659
TOP_SWIG_IFILES = \
5760
$(TOP_SWIG_DOC_IFILES) \
5861
video_sdl.i
5962

60-
TOP_SWIG_DOC_IFILES = \
61-
video_sdl_swig_doc.i
62-
6363
BUILT_SOURCES += \
6464
$(TOP_SWIG_DOC_IFILES)
6565

‎gr-vocoder/swig/Makefile.am

+4-3
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,14 @@ noinst_GUILE = vocoder.test
4141

4242
##############################
4343
# SWIG interface and library
44-
TOP_SWIG_IFILES = \
45-
$(TOP_SWIG_DOC_IFILES) \
46-
vocoder_swig.i
4744

4845
TOP_SWIG_DOC_IFILES = \
4946
vocoder_swig_doc.i
5047

48+
TOP_SWIG_IFILES = \
49+
$(TOP_SWIG_DOC_IFILES) \
50+
vocoder_swig.i
51+
5152
BUILT_SOURCES += \
5253
$(TOP_SWIG_DOC_IFILES)
5354

0 commit comments

Comments
 (0)