Merged r10385:10413 from michaelld/swig_tweaks into trunk. Passes distcheck.

[debian/gnuradio] / gnuradio-core / src / lib / swig / Makefile.am

diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am
index 2a770a3fbd7c38f290848313ac3bfbdbb46f010a..98c0321994362a3878f5bab9fff0c0dda0fe1ebd 100644 (file)
--- a/gnuradio-core/src/lib/swig/Makefile.am
+++ b/gnuradio-core/src/lib/swig/Makefile.am
@@ -1,11 +1,11 @@
 #
-# Copyright 2001,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
+# Copyright 2001,2003,2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
 # GNU Radio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 # 
 # GNU Radio is distributed in the hope that it will be useful,
@@ -28,27 +28,23 @@ include $(top_srcdir)/Makefile.common
 grgrpythondir = $(grpythondir)/gr
 grgrlibdir    = $(grpyexecdir)/gr
 
-
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir)
-
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir) \
+        $(WITH_INCLUDES)
 
 EXTRA_DIST = gen-swig-bug-fix
 
-
 LOCAL_IFILES =                         \
        gnuradio.i                      \
-       shared_ptr.i                    \
+       gr_swig_block_magic.i           \
+       gr_shared_ptr.i                 \
        sw_general.i                    \
        sw_gengen.i                     \
        sw_filter.i                     \
-       sw_io.i                         
-
+       sw_io.i                         \
+       sw_runtime.i
 
 ALL_IFILES =                           \
-       $(LOCAL_IFILES)                 
-
-
-
+       $(LOCAL_IFILES)
 
 # ----------------------------------------------------------------
 # We've split the previously monstrous gnuradio_swig_python into
@@ -75,9 +71,6 @@ BUILT_SOURCES =                               \
        gnuradio_swig_py_io.h           \
        gnuradio_swig_bug_workaround.h  
 
-
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES)
-
 # ----------------------------------------------------------------
 # We break this up into 5 libraries...
 
@@ -108,7 +101,7 @@ _gnuradio_swig_py_io_la_CXXFLAGS      = @swig_CXXFLAGS@
 
 
 # ----------------------------------------------------------------
-# Part 1: gnuradio.i -> gnuradio_swig_py_runtime
+# Part 1: sw_runtime.i -> gnuradio_swig_py_runtime
 #
 # We continue to call this gnuradio.i to avoid having to touch
 # lots of code in other modules
@@ -132,8 +125,8 @@ _gnuradio_swig_py_runtime_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime.h: gnuradio_swig_py_runtime.cc
 
-gnuradio_swig_py_runtime.cc : gnuradio.i
-       if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_py_runtime.Td -module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime.cc gnuradio.i ;\
+gnuradio_swig_py_runtime.cc : $(srcdir)/sw_runtime.i
+       if $(SWIG) $(STD_SWIG_PYTHON_ARGS) -MMD -MF gnuradio_swig_py_runtime.Td -module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime.cc $(srcdir)/sw_runtime.i ;\
        then if test $(host_os) = mingw32; \
             then sed 's,\\\\,/,g' <gnuradio_swig_py_runtime.Td >gnuradio_swig_py_runtime.d; rm -f gnuradio_swig_py_runtime.Td; \
             else mv -f gnuradio_swig_py_runtime.Td gnuradio_swig_py_runtime.d; fi \
@@ -163,8 +156,8 @@ _gnuradio_swig_py_general_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 gnuradio_swig_py_general.py gnuradio_swig_py_general.h: gnuradio_swig_py_general.cc
 
-gnuradio_swig_py_general.cc : sw_general.i
-       if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_py_general.Td -module gnuradio_swig_py_general -o gnuradio_swig_py_general.cc sw_general.i ;\
+gnuradio_swig_py_general.cc : $(srcdir)/sw_general.i
+       if $(SWIG) $(STD_SWIG_PYTHON_ARGS) -MMD -MF gnuradio_swig_py_general.Td -module gnuradio_swig_py_general -o gnuradio_swig_py_general.cc $(srcdir)/sw_general.i ;\
        then if test $(host_os) = mingw32; \
             then sed 's,\\\\,/,g' <gnuradio_swig_py_general.Td >gnuradio_swig_py_general.d; rm -f gnuradio_swig_py_general.Td; \
             else mv -f gnuradio_swig_py_general.Td gnuradio_swig_py_general.d; fi \
@@ -194,8 +187,8 @@ _gnuradio_swig_py_gengen_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen.h: gnuradio_swig_py_gengen.cc
 
-gnuradio_swig_py_gengen.cc : sw_gengen.i
-       if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_py_gengen.Td -module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen.cc sw_gengen.i ;\
+gnuradio_swig_py_gengen.cc : $(srcdir)/sw_gengen.i
+       if $(SWIG) $(STD_SWIG_PYTHON_ARGS) -MMD -MF gnuradio_swig_py_gengen.Td -module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen.cc $(srcdir)/sw_gengen.i ;\
        then if test $(host_os) = mingw32; \
             then sed 's,\\\\,/,g' <gnuradio_swig_py_gengen.Td >gnuradio_swig_py_gengen.d; rm -f gnuradio_swig_py_gengen.Td; \
             else mv -f gnuradio_swig_py_gengen.Td gnuradio_swig_py_gengen.d; fi \
@@ -225,8 +218,8 @@ _gnuradio_swig_py_filter_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 gnuradio_swig_py_filter.py gnuradio_swig_py_filter.h: gnuradio_swig_py_filter.cc
 
-gnuradio_swig_py_filter.cc : sw_filter.i
-       if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_py_filter.Td -module gnuradio_swig_py_filter -o gnuradio_swig_py_filter.cc sw_filter.i ;\
+gnuradio_swig_py_filter.cc : $(srcdir)/sw_filter.i
+       if $(SWIG) $(STD_SWIG_PYTHON_ARGS) -MMD -MF gnuradio_swig_py_filter.Td -module gnuradio_swig_py_filter -o gnuradio_swig_py_filter.cc $(srcdir)/sw_filter.i ;\
        then if test $(host_os) = mingw32; \
             then sed 's,\\\\,/,g' <gnuradio_swig_py_filter.Td >gnuradio_swig_py_filter.d; rm -f gnuradio_swig_py_filter.Td; \
             else mv -f gnuradio_swig_py_filter.Td gnuradio_swig_py_filter.d; fi \
@@ -256,8 +249,8 @@ _gnuradio_swig_py_io_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 gnuradio_swig_py_io.py gnuradio_swig_py_io.h: gnuradio_swig_py_io.cc
 
-gnuradio_swig_py_io.cc : sw_io.i
-       if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_py_io.Td -module gnuradio_swig_py_io -o gnuradio_swig_py_io.cc sw_io.i ;\
+gnuradio_swig_py_io.cc : $(srcdir)/sw_io.i
+       if $(SWIG) $(STD_SWIG_PYTHON_ARGS) -MMD -MF gnuradio_swig_py_io.Td -module gnuradio_swig_py_io -o gnuradio_swig_py_io.cc $(srcdir)/sw_io.i ;\
        then if test $(host_os) = mingw32; \
             then sed 's,\\\\,/,g' <gnuradio_swig_py_io.Td >gnuradio_swig_py_io.d; rm -f gnuradio_swig_py_io.Td; \
             else mv -f gnuradio_swig_py_io.Td gnuradio_swig_py_io.d; fi \