diff options
| author | Eric Blossom | 2010-10-22 15:14:44 -0700 |
|---|---|---|
| committer | Eric Blossom | 2010-11-10 12:13:52 -0800 |
| commit | b61a156d4d3125882bfa3563ebd4a992ba00a6f7 (patch) | |
| tree | 07081de3f675ebe69fa59201d14edcb402ecee40 | |
| parent | e3ea18ee8732f17151bb00896f982f7859c0e228 (diff) | |
| download | gnuradio-b61a156d4d3125882bfa3563ebd4a992ba00a6f7.tar.gz gnuradio-b61a156d4d3125882bfa3563ebd4a992ba00a6f7.tar.bz2 gnuradio-b61a156d4d3125882bfa3563ebd4a992ba00a6f7.zip | |
Move common stuff outside of if PYTHON
| -rw-r--r-- | Makefile.common | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/Makefile.am | 24 |
2 files changed, 15 insertions, 11 deletions
diff --git a/Makefile.common b/Makefile.common index 8b174a926..cccfb133d 100644 --- a/Makefile.common +++ b/Makefile.common @@ -29,10 +29,10 @@ LTVERSIONFLAGS = -version-info 0:0:0 -release $(LIBVER) # includes grincludedir = $(includedir)/gnuradio -if PYTHON # swig includes swigincludedir = $(grincludedir)/swig +if PYTHON # Install the gnuradio stuff in the appropriate subdirectory # This usually ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 4c15b7e61..f96352d1a 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -44,28 +44,32 @@ TOP_SWIG_IFILES = \ gnuradio_swig_py_hier.i -if PYTHON -AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ - $(WITH_INCLUDES) - -EXTRA_DIST = gen-swig-bug-fix - # SWIG headers get installed in ${prefix}/include/gnuradio/swig swiginclude_HEADERS = \ gnuradio.i \ gr_swig_block_magic.i \ gr_shared_ptr.i -# special install for this top-level Python script which includes all -# of the split Python libraries. -ourpythondir = $(grpythondir)/gr -ourpython_PYTHON = gnuradio_swig_python.py +if GUILE # This is the top level guile file, which loads all the other scm files # for gnuradio. This has to be installed top level to be found in the # default search path. guiledir = @GUILE_PKDATADIR@ guile_DATA = gnuradio_swig.scm +endif + + +if PYTHON +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 +ourpython_PYTHON = gnuradio_swig_python.py # ---------------------------------------------------------------- # FIXME As of swig 1.3.31, this still seems to be required... |