[Commit-gnuradio] r11457 - in gnuradio/branches/developers/jcorgan/pmt-gruel/gruel/src: . include/gruel lib

[jcorgan]

Author: jcorgan
Date: 2009-07-19 21:14:18 -0600 (Sun, 19 Jul 2009)
New Revision: 11457

Modified:
   gnuradio/branches/developers/jcorgan/pmt-gruel/gruel/src/Makefile.am
   gnuradio/branches/developers/jcorgan/pmt-gruel/gruel/src/include/gruel/
   
gnuradio/branches/developers/jcorgan/pmt-gruel/gruel/src/include/gruel/Makefile.am
   gnuradio/branches/developers/jcorgan/pmt-gruel/gruel/src/lib/
   gnuradio/branches/developers/jcorgan/pmt-gruel/gruel/src/lib/Makefile.am
   gnuradio/branches/developers/jcorgan/pmt-gruel/gruel/src/lib/pmt_serialize.cc
Log:
Branch now passes distcheck

Modified: gnuradio/branches/developers/jcorgan/pmt-gruel/gruel/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/pmt-gruel/gruel/src/Makefile.am        
2009-07-20 01:29:06 UTC (rev 11456)
+++ gnuradio/branches/developers/jcorgan/pmt-gruel/gruel/src/Makefile.am        
2009-07-20 03:14:18 UTC (rev 11457)
@@ -19,4 +19,5 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-SUBDIRS = include lib
+SUBDIRS = lib include scheme
+


Property changes on: 
gnuradio/branches/developers/jcorgan/pmt-gruel/gruel/src/include/gruel
___________________________________________________________________
Modified: svn:ignore
   - Makefile
Makefile.in
inet.h

   + Makefile
Makefile.in
inet.h
pmt_serial_tags.h


Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/gruel/src/include/gruel/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/gruel/src/include/gruel/Makefile.am
  2009-07-20 01:29:06 UTC (rev 11456)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/gruel/src/include/gruel/Makefile.am
  2009-07-20 03:14:18 UTC (rev 11457)
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -30,6 +30,7 @@
        $(BUILT_SOURCES) \
        pmt.h \
        pmt_pool.h \
+       pmt_serial_tags.h \
        realtime.h \
        sys_pri.h \
        thread_body_wrapper.h \


Property changes on: 
gnuradio/branches/developers/jcorgan/pmt-gruel/gruel/src/lib
___________________________________________________________________
Modified: svn:ignore
   - Makefile
Makefile.in
.libs
.deps
test_pmt
qa_pmt_unv.cc
qa_pmt_unv.h
pmt_unv_int.h
pmt_serial_tags.h
pmt_unv.cc
stamp-sources-generate

   + Makefile
Makefile.in
.libs
.deps
test_pmt
qa_pmt_unv.cc
qa_pmt_unv.h
pmt_unv_int.h
pmt_unv.cc
stamp-sources-generate


Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/gruel/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/pmt-gruel/gruel/src/lib/Makefile.am    
2009-07-20 01:29:06 UTC (rev 11456)
+++ gnuradio/branches/developers/jcorgan/pmt-gruel/gruel/src/lib/Makefile.am    
2009-07-20 03:14:18 UTC (rev 11457)
@@ -49,7 +49,8 @@
 
 python_built_sources = $(GENERATED_H) $(GENERATED_CC)
 
-BUILT_SOURCES = $(python_built_sources) pmt_serial_tags.h
+PMT_SERIAL_TAGS_H = 
$(abs_top_builddir)/gruel/src/include/gruel/pmt_serial_tags.h
+BUILT_SOURCES = $(python_built_sources) $(PMT_SERIAL_TAGS_H)
 
 EXTRA_DIST = $(code_generator)
 
@@ -71,12 +72,11 @@
        $(BOOST_THREAD_LIB)             \
        -lstdc++
 
-noinst_HEADERS =
+noinst_HEADERS = \
        $(GENERATED_H)                  \
        pmt_int.h                       \
        qa_pmt.h                        \
-       qa_pmt_prims.h                  \
-       pmt_serial_tags.h       # FIXME this is generated, needs to go in 
include/gruel
+       qa_pmt_prims.h
 
 # Build the qa code into its own library
 
@@ -116,5 +116,5 @@
 
 # Rule to create the build header file using GUILE
 # Doesn't need parallel protections because there is a single target
-pmt_serial_tags.h: $(srcdir)/../scheme/gnuradio/gen-serial-tags.scm 
$(srcdir)/../scheme/gnuradio/pmt-serial-tags.scm
-       $(RUN_GUILE) $(srcdir)/../scheme/gnuradio/gen-serial-tags.scm 
$(srcdir)/../scheme/gnuradio/pmt-serial-tags.scm pmt_serial_tags.h
+$(PMT_SERIAL_TAGS_H): $(srcdir)/../scheme/gnuradio/gen-serial-tags.scm 
$(srcdir)/../scheme/gnuradio/pmt-serial-tags.scm
+       $(RUN_GUILE) $(srcdir)/../scheme/gnuradio/gen-serial-tags.scm 
$(srcdir)/../scheme/gnuradio/pmt-serial-tags.scm $(PMT_SERIAL_TAGS_H)

Modified: 
gnuradio/branches/developers/jcorgan/pmt-gruel/gruel/src/lib/pmt_serialize.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pmt-gruel/gruel/src/lib/pmt_serialize.cc   
    2009-07-20 01:29:06 UTC (rev 11456)
+++ 
gnuradio/branches/developers/jcorgan/pmt-gruel/gruel/src/lib/pmt_serialize.cc   
    2009-07-20 03:14:18 UTC (rev 11457)
@@ -25,7 +25,7 @@
 #include <vector>
 #include <gruel/pmt.h>
 #include "pmt_int.h"
-#include "pmt_serial_tags.h"
+#include "gruel/pmt_serial_tags.h"
 
 namespace gruel {