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 /gnuradio-core/src/lib/swig/Makefile.am | |
| 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 'gnuradio-core/src/lib/swig/Makefile.am')
| -rw-r--r-- | gnuradio-core/src/lib/swig/Makefile.am | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index a97bb6ea00..f8e7640ae1 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -22,7 +22,8 @@ include $(top_srcdir)/Makefile.common include $(top_srcdir)/Makefile.swig -BUILT_SOURCES = $(grinclude_HEADERS) $(swig_built_sources) +AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ + $(WITH_INCLUDES) # ---------------------------------------------------------------- # We've split the previously monstrous gnuradio_core into 6 @@ -52,11 +53,6 @@ nobase_swiginclude_HEADERS = \ guile/std_vector.i -AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ - $(WITH_INCLUDES) - -EXTRA_DIST = gen-swig-bug-fix - # special install for this top-level Python script which includes all # of the split Python libraries. ourpythondir = $(grpythondir)/gr @@ -67,9 +63,12 @@ ourpython_PYTHON = gnuradio_core.py # gnuradio_swig_bug_workaround.h : gnuradio_core_runtime.py $(srcdir)/gen-swig-bug-fix # $(PYTHON) $(srcdir)/gen-swig-bug-fix python/gnuradio_core_runtime.cc $@ +EXTRA_DIST += gen-swig-bug-fix + # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = gnuradio_swig_bug_workaround.h + # Install so that they end up available as: # import gnuradio.gr # This ends up at: @@ -89,5 +88,4 @@ 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) - SWIG_GUILE_FLAGS += -DIN_GNURADIO_CORE |