summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.common19
-rw-r--r--gnuradio-core/src/lib/swig/Makefile.am18
2 files changed, 19 insertions, 18 deletions
diff --git a/Makefile.common b/Makefile.common
index 95dacf987..8b174a926 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -114,6 +114,25 @@ grc_blocksdir = $(pkgdatadir)/grc/blocks
STAMPS =
MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT
+## SWIG suffixes for automake to know about
+SUFFIXES = .i .scm .py
+
+if GUILE
+.i.scm:
+ @echo "Compile .i to .scm"
+ @test -d "guile" || $(mkinstalldirs) "guile"
+ $(SWIG) $(STD_SWIG_GUILE_ARGS) $($*_swig_args) \
+ -module $* -o guile/$*.cc $<
+# -MD -MF guile/$(DEPDIR)/$*.Std
+endif
+
+# Compile a .i file to what python needs
+.i.py:
+ @echo "Compile .i to .py"
+ @test -d "python" || $(mkinstalldirs) "python"
+ $(SWIG) $(STD_SWIG_PYTHON_ARGS) $($*_swig_args) \
+ -module $* -o python/$*.cc -oh python/$*.h $<
+
# Don't distribute the files defined in the variable 'no_dist_files'
dist-hook:
@for file in $(no_dist_files); do \
diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am
index 21bfe6761..5f5a12eb2 100644
--- a/gnuradio-core/src/lib/swig/Makefile.am
+++ b/gnuradio-core/src/lib/swig/Makefile.am
@@ -116,21 +116,3 @@ no_dist_files = $(swig_built_sources)
# or even with -outdir guile in SWIG_GUILE_ARGS, swig keeps putting a
# gnuradio_swig_py_*_wrap.cxx in the source directory.
-## SWIG suffixes for automake to know about
-SUFFIXES = .i .scm .pyvi
-
-if GUILE
-.i.scm:
- @echo "Compile .i to .scm"
- @test -d "guile" || $(mkinstalldirs) "guile"
- $(SWIG) $(STD_SWIG_GUILE_ARGS) $($*_swig_args) \
- -module $* -o guile/$*.cc $<
-# -MD -MF guile/$(DEPDIR)/$*.Std
-endif
-
-# Compile a .i file to what python needs
-.i.py:
- @echo "Compile .i to .py"
- @test -d "python" || $(mkinstalldirs) "python"
- $(SWIG) $(STD_SWIG_PYTHON_ARGS) $($*_swig_args) \
- -module $* -o python/$*.cc -oh python/$*.h $<