diff options
| author | Eric Blossom <eb@comsec.com> | 2010-11-24 17:29:11 -0800 |
|---|---|---|
| committer | Eric Blossom <eb@comsec.com> | 2010-11-24 17:29:11 -0800 |
| commit | d692a41f98e7b888c745efbb9fcbbb0400f39025 (patch) | |
| tree | 591782e695d1d29f2dfcfe6390fc21cd99a06a16 /gr-howto-write-a-block/swig | |
| parent | 42fe3e571be14e70cb06ea1244125553f0606be4 (diff) | |
Major Makefile.am housecleaning. Passes distcheck.
Move all occurrences of swig_built_sources out of Makefile.am's.
Move all SWIG related use of BUILT_SOURCES out of Makefile.am's.
Clean up 'if PYTHON' conditionalization in gr-*
Still left to do: fix Makefile.swig CLEANFILES and no_dist_files
such that they remove exactly the generated files.
Diffstat (limited to 'gr-howto-write-a-block/swig')
| -rw-r--r-- | gr-howto-write-a-block/swig/Makefile.am | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/gr-howto-write-a-block/swig/Makefile.am b/gr-howto-write-a-block/swig/Makefile.am index 17c4334f66..c6b1786f69 100644 --- a/gr-howto-write-a-block/swig/Makefile.am +++ b/gr-howto-write-a-block/swig/Makefile.am @@ -22,21 +22,10 @@ include $(top_srcdir)/Makefile.common include $(top_srcdir)/Makefile.swig -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -CLEANFILES = python/*.cc python/*.h python/*.d -if GUILE -CLEANFILES += guile/*.cc gnuradio/*.scm guile/*.d -endif - AM_CPPFLAGS += -I$(top_srcdir)/lib -swig_built_sources = - -if PYTHON ################################### -# SWIG Python interface and library +# SWIG interfaces and libraries TOP_SWIG_IFILES = \ howto.i @@ -49,21 +38,8 @@ howto_la_swig_libadd = \ $(top_builddir)/lib/libgnuradio-howto.la # additional SWIG files to be installed -aqhowto_swiginclude_headers = \ +howto_swiginclude_headers = \ howto_square_ff.i \ howto_square2_ff.i -EXTRA_DIST = $(aqhowto_swiginclude_headers) - -PYTHON_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(subst .i,.py,$(HFILE))) -swig_built_sources += $(PYTHON_GEN) -endif - -if GUILE -GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(patsubst %.i,gnuradio/%.scm,$(HFILE))) -swig_built_sources += $(GUILE_GEN) -endif - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) - +EXTRA_DIST += $(howto_swiginclude_headers) |