rearrange includes to always be: internal GR, external, with GR.

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

diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index 122f977be6627eb766210e719d8abf5ee3248095..db5be4adedec59da85395fb6c32cb3cf3ab094c2 100644 (file)
--- a/gr-usrp/src/Makefile.am
+++ b/gr-usrp/src/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2005,2006,2008 Free Software Foundation, Inc.
+# Copyright 2004,2005,2006,2008,2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,13 +21,23 @@
 
 include $(top_srcdir)/Makefile.common
 
+# ----------------------------------------------------------------
+# Misc. build/installation activities
+
+EXTRA_DIST = run_tests.in
+
+DISTCLEANFILES = run_tests
+
+noinst_PYTHON =        qa_usrp.py
+
 # ----------------------------------------------------------------
 # The straight C++ library
 
 AM_CPPFLAGS = \
+       $(USRP_INCLUDES) \
        $(STD_DEFINES_AND_INCLUDES) \
        $(PYTHON_CPPFLAGS) \
-       $(USRP_INCLUDES) \
+       $(USB_INCLUDES) \
        $(WITH_INCLUDES)
 
 lib_LTLIBRARIES = \
@@ -46,7 +56,7 @@ libgnuradio_usrp_la_LIBADD = \
        $(GNURADIO_CORE_LA) \
        $(USRP_LA)                      
 
-libgnuradio_usrp_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
+libgnuradio_usrp_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 
 grinclude_HEADERS = \
        usrp_base.h \
@@ -57,80 +67,49 @@ grinclude_HEADERS = \
        usrp_source_c.h \
        usrp_source_s.h
 
+if PYTHON
 # ----------------------------------------------------------------
-# The SWIG library and Python modules
-#
-# Install this stuff so that it ends up as the gnuradio.usrp module
-# This usually ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio/usrp
-
-ourpythondir = $(grpythondir)/usrp
-ourlibdir    = $(grpyexecdir)/usrp
-
-BUILT_SOURCES = \
-       usrp_swig.cc \
-       usrp_swig.py            
-
-LOCAL_IFILES = \
-       $(srcdir)/usrp.i \
-       $(srcdir)/usrp_base.i \
-       $(srcdir)/usrp_source_base.i \
-       $(srcdir)/usrp_source_c.i \
-       $(srcdir)/usrp_source_s.i \
-       $(srcdir)/usrp_sink_base.i \
-       $(srcdir)/usrp_sink_c.i \
-       $(srcdir)/usrp_sink_s.i \
-       $(srcdir)/usrp_standard.i
-
-NON_LOCAL_IFILES = \
-       $(GNURADIO_I)
-
-ALL_IFILES = \
-       $(LOCAL_IFILES) \
-       $(NON_LOCAL_IFILES)             
+# The SWIG library
+TESTS = run_tests
 
-ourlib_LTLIBRARIES = \
-       _usrp_swig.la
+TOP_SWIG_IFILES =              \
+       usrp_swig.i
 
-ourlib_PYTHON = \
-       __init__.py \
-       usrp_swig.py
+# Install so that they end up available as:
+#   import gnuradio.usrp
+# This ends up at:
+#   ${prefix}/lib/python${python_version}/site-packages/gnuradio/usrp
+usrp_swig_pythondir_category =         \
+       gnuradio/usrp
 
-_usrp_swig_la_SOURCES =        \
-       usrp_swig.cc                    
+# additional arguments to the SWIG command
+usrp_swig_swig_args =          \
+       $(USRP_INCLUDES)
 
-_usrp_swig_la_LIBADD = \
-       $(PYTHON_LDFLAGS) \
+# additional libraries for linking with the SWIG-generated library
+usrp_swig_la_swig_libadd =     \
        libgnuradio-usrp.la
 
-_usrp_swig_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
-
-_usrp_swig_la_CXXFLAGS = @swig_CXXFLAGS@
-
-SWIGPYTHONARGS = \
-       $(SWIGPYTHONFLAGS) \
-       $(STD_DEFINES_AND_INCLUDES) \
-       $(USRP_INCLUDES) \
-       $(WITH_INCLUDES) \
-       $(WITH_SWIG_INCLUDES)
-
-usrp_swig.cc usrp_swig.py: $(ALL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module usrp_swig -o usrp_swig.cc $(srcdir)/usrp.i
-
-noinst_PYTHON =        \
-       qa_usrp.py                      
-
-swiginclude_HEADERS = \
-       $(LOCAL_IFILES)
-
-# 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
-
-# ----------------------------------------------------------------
-# Misc. build/installation activities
-
-MOSTLYCLEANFILES = $(BUILT_SOURCES) *~ *.pyc
-EXTRA_DIST = run_tests.in
-TESTS = run_tests
+# additional Python files to be installed along with the SWIG-generated one
+usrp_swig_python =             \
+       __init__.py
+
+# additional SWIG files to be installed
+usrp_swig_swiginclude_headers =        \
+       usrp_base.i             \
+       usrp_source_base.i      \
+       usrp_source_c.i         \
+       usrp_source_s.i         \
+       usrp_sink_base.i        \
+       usrp_sink_c.i           \
+       usrp_sink_s.i           \
+       usrp_standard.i
+
+include $(top_srcdir)/Makefile.swig
+
+# add some of the variables generated inside the Makefile.swig.gen
+BUILT_SOURCES = $(swig_built_sources)
+
+# Do not distribute the output of SWIG
+no_dist_files = $(swig_built_sources)
+endif