[Commit-gnuradio] r8058 - in gnuradio/branches/developers/eb/trunk-with-gcell: gnuradio-core/src/lib/filter gnuradio-core/src/lib/gengen gr-trellis/src/lib

[eb]

Author: eb
Date: 2008-03-19 17:48:19 -0600 (Wed, 19 Mar 2008)
New Revision: 8058

Modified:
   
gnuradio/branches/developers/eb/trunk-with-gcell/gnuradio-core/src/lib/filter/Makefile.am
   
gnuradio/branches/developers/eb/trunk-with-gcell/gnuradio-core/src/lib/gengen/Makefile.am
   
gnuradio/branches/developers/eb/trunk-with-gcell/gr-trellis/src/lib/Makefile.am
Log:
merged r8056:8057 from trunk into branch, will remove before merge back into 
trunk

Modified: 
gnuradio/branches/developers/eb/trunk-with-gcell/gnuradio-core/src/lib/filter/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/eb/trunk-with-gcell/gnuradio-core/src/lib/filter/Makefile.am
   2008-03-19 22:49:51 UTC (rev 8057)
+++ 
gnuradio/branches/developers/eb/trunk-with-gcell/gnuradio-core/src/lib/filter/Makefile.am
   2008-03-19 23:48:19 UTC (rev 8058)
@@ -95,7 +95,7 @@
              fi
 
 
-BUILT_SOURCES = $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC) 
filter_generated.i
+BUILT_SOURCES = $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC)
 
 
 # ----------------------------------------------------------------

Modified: 
gnuradio/branches/developers/eb/trunk-with-gcell/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/eb/trunk-with-gcell/gnuradio-core/src/lib/gengen/Makefile.am
   2008-03-19 22:49:51 UTC (rev 8057)
+++ 
gnuradio/branches/developers/eb/trunk-with-gcell/gnuradio-core/src/lib/gengen/Makefile.am
   2008-03-19 23:48:19 UTC (rev 8058)
@@ -144,7 +144,7 @@
              fi
 
 
-BUILT_SOURCES = $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC) 
gengen_generated.i
+BUILT_SOURCES = $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC)
 
 # ----------------------------------------------------------------
 

Modified: 
gnuradio/branches/developers/eb/trunk-with-gcell/gr-trellis/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/eb/trunk-with-gcell/gr-trellis/src/lib/Makefile.am 
    2008-03-19 22:49:51 UTC (rev 8057)
+++ 
gnuradio/branches/developers/eb/trunk-with-gcell/gr-trellis/src/lib/Makefile.am 
    2008-03-19 23:48:19 UTC (rev 8058)
@@ -97,8 +97,7 @@
        $(GENERATED_H)          \
        $(GENERATED_I)          \
        $(GENERATED_CC)         \
-       $(swig_built_sources)   \
-       trellis_generated.i     
+       $(swig_built_sources)   
 
 ALL_IFILES =                   \
        $(LOCAL_IFILES)         \