diff options
| author | Eric Blossom <eb@comsec.com> | 2010-11-21 19:43:39 -0800 |
|---|---|---|
| committer | Eric Blossom <eb@comsec.com> | 2010-11-21 19:43:39 -0800 |
| commit | e4eb47f0dd55485693e70ec2f45f79912fa899c4 (patch) | |
| tree | f35760f67423c1547717ceaacdf16672870129b8 /gnuradio-core/src/lib/swig/Makefile.am | |
| parent | 6f6a9f3f2f089c94e58a4202ee5ff2c47d1baf1f (diff) | |
Clean up lib/swig/Makefile.am, Makefile.common and Makefile.swig
Confirmed that it builds and make checks on all four combintations
of --{enable,disable}-{python,guile}.
Have not tested make dist, but expect that there may be some problems
with it. I'm pretty sure that not all files that need to be removed
from the distribution are removed, and make clean may still be leaving
some files around.
Diffstat (limited to 'gnuradio-core/src/lib/swig/Makefile.am')
| -rw-r--r-- | gnuradio-core/src/lib/swig/Makefile.am | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 95edf51810..a97bb6ea00 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -24,11 +24,6 @@ include $(top_srcdir)/Makefile.swig BUILT_SOURCES = $(grinclude_HEADERS) $(swig_built_sources) -CLEANFILES = python/*.cc python/*.h -if GUILE -CLEANFILES += guile/*.cc gnuradio/*.scm -endif - # ---------------------------------------------------------------- # We've split the previously monstrous gnuradio_core into 6 # smaller pieces. This reduces compile time coupling and creates @@ -62,7 +57,6 @@ AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ EXTRA_DIST = gen-swig-bug-fix -if PYTHON # special install for this top-level Python script which includes all # of the split Python libraries. ourpythondir = $(grpythondir)/gr @@ -95,20 +89,5 @@ gnuradio_core_filter_la_swig_libadd = $(GNURADIO_CORE_LA) gnuradio_core_io_la_swig_libadd = $(GNURADIO_CORE_LA) gnuradio_core_hier_la_swig_libadd = $(GNURADIO_CORE_LA) -# add some of the variables generated inside the Makefile.swig - -# include the SWIG-generated .h files in the BUILT SOURCES, since they -# aren't by default when using Makefile.swig; order doesn't matter. -PYTHON_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(subst .i,.py,$(HFILE))) -swig_built_sources += $(PYTHON_GEN) -endif # end of if python -if GUILE SWIG_GUILE_FLAGS += -DIN_GNURADIO_CORE -GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(patsubst %.i,gnuradio/%.scm,$(HFILE))) -swig_built_sources += $(GUILE_GEN) -endif # end of if guile - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) - |