[Commit-gnuradio] r10590 - in gnuradio/branches/developers/michaelld/am_swig_4: . gr-howto-write-a-block

[michaelld]

Author: michaelld
Date: 2009-03-12 20:29:02 -0600 (Thu, 12 Mar 2009)
New Revision: 10590

Modified:
   gnuradio/branches/developers/michaelld/am_swig_4/Makefile.am
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.am
   
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.common
Log:
Add new Makefile.swig files to the distribution.

Both the branch and gr-howto work correctly through distcheck on OSX
and Ubuntu.



Modified: gnuradio/branches/developers/michaelld/am_swig_4/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/am_swig_4/Makefile.am        
2009-03-13 01:20:31 UTC (rev 10589)
+++ gnuradio/branches/developers/michaelld/am_swig_4/Makefile.am        
2009-03-13 02:29:02 UTC (rev 10590)
@@ -28,7 +28,11 @@
        configure \
        configure-cell-cross \
        config.h.in \
-       run_tests.sh.in
+       run_tests.sh.in \
+       Makefile.swig \
+       Makefile.swig.gen.t \
+       Makefile.par.gen \
+       Makefile.gen.gen
 
 SUBDIRS = @build_dirs@
 DIST_SUBDIRS = @build_dirs@ @skipped_dirs@ @with_dirs@

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.am
 2009-03-13 01:20:31 UTC (rev 10589)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.am
 2009-03-13 02:29:02 UTC (rev 10590)
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2008 Free Software Foundation, Inc.
+# Copyright 2004,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -23,7 +23,9 @@
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST = bootstrap configure config.h.in
+EXTRA_DIST = bootstrap configure config.h.in \
+       Makefile.swig Makefile.swig.gen.t
+
 SUBDIRS = config src
 DIST_SUBDIRS = config src doc
 

Modified: 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.common
===================================================================
--- 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.common
     2009-03-13 01:20:31 UTC (rev 10589)
+++ 
gnuradio/branches/developers/michaelld/am_swig_4/gr-howto-write-a-block/Makefile.common
     2009-03-13 02:29:02 UTC (rev 10590)
@@ -24,11 +24,11 @@
 
 # includes
 grincludedir = $(includedir)/gnuradio
-WITH_INCLUDES = -I$(grincludedir)
+WITH_INCLUDES = -I$(GNURADIO_CORE_INCLUDEDIR)
 
 # swig includes 
 swigincludedir = $(grincludedir)/swig
-WITH_SWIG_INCLUDES = -I$(swigincludedir)
+WITH_SWIG_INCLUDES = -I$(GNURADIO_CORE_INCLUDEDIR)/swig
 
 # Install this stuff in the appropriate subdirectory
 # This usually ends up at: