diff options
| author | jcorgan | 2009-02-02 14:27:28 +0000 |
|---|---|---|
| committer | jcorgan | 2009-02-02 14:27:28 +0000 |
| commit | 8193fd8a044a18471a6091249195d15ae6d814be (patch) | |
| tree | e9b491d81ad03024280209ac677d589c841b8f98 /usrp/host/swig | |
| parent | 09f236be864aaa3b5216eb42676eafb38d47b587 (diff) | |
| download | gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.tar.gz gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.tar.bz2 gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.zip | |
Merged r10288:10370 from michaelld/swigpythonargs into trunk. Passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10371 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp/host/swig')
| -rw-r--r-- | usrp/host/swig/Makefile.am | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/usrp/host/swig/Makefile.am b/usrp/host/swig/Makefile.am index 57bc3bdc8..08e6c436b 100644 --- a/usrp/host/swig/Makefile.am +++ b/usrp/host/swig/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2003,2004,2006,2007,2008 Free Software Foundation, Inc. +# Copyright 2001,2003,2004,2006,2007,2008,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -52,10 +52,8 @@ ourpython_PYTHON = \ usrp_fpga_regs.py \ usrp_prims.py - -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(AM_CPPFLAGS) $(WITH_SWIG_INCLUDES) \ - $(WITH_INCLUDES) - +# special SWIG flags +LOCAL_SWIG_DEFINES_AND_INCLUDES = $(USRP_INCLUDES) ourlib_LTLIBRARIES = \ _usrp_prims.la @@ -71,9 +69,9 @@ _usrp_prims_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version _usrp_prims_la_CXXFLAGS = @swig_CXXFLAGS@ -prims.cc usrp_prims.py : prims.i ../../firmware/include/fpga_regs_common.h ../../firmware/include/fpga_regs_standard.h - $(SWIG) $(SWIGPYTHONARGS) -module usrp_prims -o prims.cc prims.i - +prims.cc usrp_prims.py : $(srcdir)/prims.i ../../firmware/include/fpga_regs_common.h ../../firmware/include/fpga_regs_standard.h + $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module usrp_prims \ + -o prims.cc $(srcdir)/prims.i MOSTLYCLEANFILES = \ prims.cc usrp_prims.py *~ *.pyc |