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

[debian/gnuradio] / gr-howto-write-a-block / src / lib / Makefile.am

diff --git a/gr-howto-write-a-block/src/lib/Makefile.am b/gr-howto-write-a-block/src/lib/Makefile.am
index 04bac39d7c4b5d8d82ff2d316d3c8724d9ade156..c6fe7ca441de438497ef731ea2ec1007a8aace2a 100644 (file)
--- a/gr-howto-write-a-block/src/lib/Makefile.am
+++ b/gr-howto-write-a-block/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,7 +30,7 @@ ourlibdir    = $(grpyexecdir)
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS)
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(SWIGGRFLAGS)
+SWIG_PYTHON_ARGS = $(SWIG_PYTHON_FLAGS) $(SWIGGRFLAGS)
 
 ALL_IFILES =                           \
        $(LOCAL_IFILES)                 \
@@ -41,7 +41,7 @@ NON_LOCAL_IFILES =                    \
 
 
 LOCAL_IFILES =                                 \
-       $(top_srcdir)/src/lib/howto.i                           
+       $(srcdir)/howto.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,8 +72,9 @@ _howto_la_LIBADD =                    \
        $(PYTHON_LDFLAGS)               \
        -lstdc++                        
 
-howto.cc howto.py: $(LOCAL_IFILES) $(ALL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module howto -o howto.cc $(LOCAL_IFILES)
+howto.cc howto.py: $(ALL_IFILES)
+       $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module howto \
+               -o howto.cc $(LOCAL_IFILES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =                    \