Cleanup, changed ifc_name() to interface_name()

[debian/gnuradio] / gr-usrp2 / src / Makefile.am

diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am
index da626d594b59041776756e14b708f296f1913f12..90796ceae9103e3742ee1f98bcc599e7ed008d19 100644 (file)
--- a/gr-usrp2/src/Makefile.am
+++ b/gr-usrp2/src/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
 # 
@@ -38,25 +38,26 @@ lib_LTLIBRARIES = libgr-usrp2.la
 libgr_usrp2_la_SOURCES = \
        rx_16sc_handler.cc \
        rx_32fc_handler.cc \
+       usrp2_base.cc \
        usrp2_source_base.cc \
        usrp2_source_16sc.cc \
-       usrp2_source_32fc.cc
-#      usrp2_source_16sc.cc
-#      usrp2_sink_base.cc
-#      usrp2_sink_32fc.cc
-#      usrp2_sink_16sc.cc
+       usrp2_source_32fc.cc \
+       usrp2_sink_base.cc \
+       usrp2_sink_16sc.cc \
+       usrp2_sink_32fc.cc
 
 libgr_usrp2_la_LIBADD = \
        $(USRP2_LA) \
        $(GNURADIO_CORE_LA) 
 
 grinclude_HEADERS = \
+       usrp2_base.h \
        usrp2_source_base.h \
        usrp2_source_32fc.h \
-        usrp2_source_16sc.h
-#      usrp2_sink_base.h \
-#      usrp2_sink_32fc.h \
-#      usrp2_sink_16sc.h
+       usrp2_source_16sc.h \
+       usrp2_sink_base.h \
+       usrp2_sink_16sc.h \
+       usrp2_sink_32fc.h
 
 noinst_HEADERS = \
        rx_16sc_handler.h \
@@ -87,17 +88,13 @@ BUILT_SOURCES = usrp2.cc usrp2.py
 # Install the SWIG python output
 ourpython_PYTHON = usrp2.py
 
-# Arguments to the swig wrapper generator
-SWIGPYTHONARGS = \
-       $(STD_DEFINES_AND_INCLUDES) \
-       $(SWIGPYTHONFLAGS) \
-       $(USRP2_INCLUDES) \
-       $(WITH_INCLUDES) \
-       $(WITH_SWIG_INCLUDES)
+# Special swig arguments
+LOCAL_SWIG_DEFINES_AND_INCLUDES = $(USRP2_INCLUDES)
 
 # Invoke SWIG wrapper generator
 usrp2.cc usrp2.py: $(ALL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module usrp2 -o usrp2.cc $(LOCAL_IFILES)
+       $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module usrp2 \
+               -o usrp2.cc $(LOCAL_IFILES)
 
 # Create the Python shared library
 ourlib_LTLIBRARIES = _usrp2.la