fix white space

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

diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am
index da626d594b59041776756e14b708f296f1913f12..8425c497caff94b1c532282f2e0a23c12e6b2709 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
 # 
@@ -21,6 +21,21 @@
 
 include $(top_srcdir)/Makefile.common
 
+# ----------------------------------------------------------------------
+# Local Python files, not installed
+#
+# qa_usrp2.py
+# ----------------------------------------------------------------------
+
+noinst_PYTHON = qa_usrp2.py
+
+# ----------------------------------------------------------------------
+# Miscellaneous build operations
+# ----------------------------------------------------------------------
+
+EXTRA_DIST = run_tests.in
+DISTCLEANFILES = run_tests
+
 # ----------------------------------------------------------------------
 # C++ block API interface librar(ies)
 #
@@ -33,104 +48,68 @@ AM_CPPFLAGS = \
        $(USRP2_INCLUDES) \
        $(WITH_INCLUDES)
 
-lib_LTLIBRARIES = libgr-usrp2.la
+lib_LTLIBRARIES = libgnuradio-usrp2.la
 
-libgr_usrp2_la_SOURCES = \
+libgnuradio_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 = \
+libgnuradio_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 \
        rx_32fc_handler.h
 
+if PYTHON
 # ----------------------------------------------------------------------
 # Python SWIG wrapper around C++ library
 #
 # usrp2.py
 # _usrp2.so
 # ----------------------------------------------------------------------
+TESTS = run_tests
 
-# Python installation locations
-ourpythondir = $(grpythondir)
-ourlibdir    = $(grpyexecdir)
-
-# SWIG interface files
-LOCAL_IFILES = $(srcdir)/usrp2.i
-NON_LOCAL_IFILES = $(GNURADIO_I)
-ALL_IFILES = $(LOCAL_IFILES) $(NON_LOCAL_IFILES)               
-
-# Install the SWIG interface files
-swiginclude_HEADERS = $(LOCAL_IFILES)
-
-# Generated by SWIG wrapper generator
-BUILT_SOURCES = usrp2.cc usrp2.py                      
-
-# Install the SWIG python output
-ourpython_PYTHON = usrp2.py
+TOP_SWIG_IFILES =              \
+       usrp2.i
 
-# Arguments to the swig wrapper generator
-SWIGPYTHONARGS = \
-       $(STD_DEFINES_AND_INCLUDES) \
-       $(SWIGPYTHONFLAGS) \
-       $(USRP2_INCLUDES) \
-       $(WITH_INCLUDES) \
-       $(WITH_SWIG_INCLUDES)
-
-# Invoke SWIG wrapper generator
-usrp2.cc usrp2.py: $(ALL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module usrp2 -o usrp2.cc $(LOCAL_IFILES)
-
-# Create the Python shared library
-ourlib_LTLIBRARIES = _usrp2.la
-_usrp2_la_SOURCES = usrp2.cc
-_usrp2_la_CXXFLAGS = @swig_CXXFLAGS@
-_usrp2_la_LDFLAGS = $(swig_CXXFLAGS) $(NO_UNDEFINED) -module -avoid-version
-
-# Link the library as needed
-_usrp2_la_LIBADD = \
-       $(PYTHON_LDFLAGS) \
-       libgr-usrp2.la \
-       $(GNURADIO_CORE_LA) \
-       $(USRP2_LIBS) \
-       -lstdc++
-
-# Don't distribute output of swig
-dist-hook:
-       @for file in $(BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done
-       @for file in $(BUILT_SOURCES); do $(RM) $(distdir)/$$file; done
+# Install so that they end up available as:
+#   import gnuradio.usrp2
+# This ends up at:
+#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
+usrp2_pythondir_category =     \
+       gnuradio
 
-# ----------------------------------------------------------------------
-# Local Python files, not installed
-#
-# qa_usrp2.py
-# ----------------------------------------------------------------------
+# additional arguments to the SWIG command
+usrp2_swig_args =              \
+       $(USRP2_INCLUDES)
 
-noinst_PYTHON = qa_usrp2.py                    
+# additional libraries for linking with the SWIG-generated library
+usrp2_la_swig_libadd =         \
+       libgnuradio-usrp2.la
 
+include $(top_srcdir)/Makefile.swig
 
-# ----------------------------------------------------------------------
-# Miscellaneous build operations
-# ----------------------------------------------------------------------
+# add some of the variables generated inside the Makefile.swig.gen
+BUILT_SOURCES = $(swig_built_sources)
 
-EXTRA_DIST = run_tests.in
-TESTS = run_tests
-MOSTLYCLEANFILES = $(BUILT_SOURCES) *.pyc
+# Do not distribute the output of SWIG
+no_dist_files = $(swig_built_sources)
+endif