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

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

diff --git a/gr-gpio/src/lib/Makefile.am b/gr-gpio/src/lib/Makefile.am
index f05a581acce9dbd6ea70cd1ca29ca49c55678669..1d2451f1cd9e96e3605180827883199fca342c72 100644 (file)
--- a/gr-gpio/src/lib/Makefile.am
+++ b/gr-gpio/src/lib/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2005,2006,2007,2008 Free Software Foundation, Inc.
+# Copyright 2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -26,9 +26,6 @@ ourlibdir    = $(grpyexecdir)/gpio
 
 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)             
@@ -36,7 +33,7 @@ ALL_IFILES =                          \
 NON_LOCAL_IFILES = $(GNURADIO_I)
 
 LOCAL_IFILES =                                 \
-       $(top_srcdir)/gr-gpio/src/lib/gpio.i                            
+       $(srcdir)/gpio.i                                
 
 # These files are built by SWIG.  The first is the C++ glue.
 # The second is the python wrapper that loads the _gpio shared library
@@ -67,8 +64,9 @@ _gpio_swig_la_LIBADD =                        \
        $(GNURADIO_CORE_LA)             \
        -lstdc++                        
 
-gpio_swig.cc gpio_swig.py: $(LOCAL_IFILES) $(ALL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module gpio_swig -o gpio_swig.cc $(LOCAL_IFILES)
+gpio_swig.cc gpio_swig.py: $(ALL_IFILES)
+       $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module gpio_swig \
+               -o gpio_swig.cc $(LOCAL_IFILES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =                    \