Merged r10288:10370 from michaelld/swigpythonargs into trunk. Passes distcheck.

[debian/gnuradio] / gr-radio-astronomy / src / lib / Makefile.am

diff --git a/gr-radio-astronomy/src/lib/Makefile.am b/gr-radio-astronomy/src/lib/Makefile.am
index f3351bf88ca04b1b3796b7650e5a8fec2fbff23f..bfd1928b44f7484ae3c49b5306819d3307595b78 100644 (file)
--- a/gr-radio-astronomy/src/lib/Makefile.am
+++ b/gr-radio-astronomy/src/lib/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2005,2006,2008 Free Software Foundation, Inc.
+# Copyright 2004,2005,2006,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -30,9 +30,6 @@ ourlibdir    = $(grpyexecdir)
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
-       $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
-
 ALL_IFILES =                           \
        $(LOCAL_IFILES)                 \
        $(NON_LOCAL_IFILES)             
@@ -41,7 +38,7 @@ NON_LOCAL_IFILES =                    \
        $(GNURADIO_I)
 
 LOCAL_IFILES =                                 \
-       $(top_srcdir)/gr-radio-astronomy/src/lib/ra.i                           
+       $(srcdir)/ra.i                          
 
 # These files are built by SWIG.  The first is the C++ glue.
 # The second is the python wrapper that loads the _howto shared library
@@ -72,7 +69,7 @@ _ra_la_LIBADD =               \
        -lstdc++                        
 
 ra.cc ra.py: $(ALL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module ra -o ra.cc $(LOCAL_IFILES)
+       $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module ra -o ra.cc $(LOCAL_IFILES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =