X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gnuradio-core%2Fsrc%2Flib%2Fruntime%2FMakefile.am;h=f67e8843d16518130f76296241b7ea80aa2a7ba2;hb=58a1356ed70994c0f24afa8a276b7e62979c28cf;hp=91d3c144be4d2f790c70abcb131c2868ce7a4617;hpb=cbe1628f2eb1a1a3c8b0b96a3b1334a039074def;p=debian%2Fgnuradio

diff --git a/gnuradio-core/src/lib/runtime/Makefile.am b/gnuradio-core/src/lib/runtime/Makefile.am
index 91d3c144..f67e8843 100644
--- a/gnuradio-core/src/lib/runtime/Makefile.am
+++ b/gnuradio-core/src/lib/runtime/Makefile.am
@@ -1,11 +1,11 @@
 #
-# Copyright 2003,2004 Free Software Foundation, Inc.
+# Copyright 2003,2004,2007,2008,2009,2010 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,
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES)
+AM_CPPFLAGS = $(GRUEL_INCLUDES) $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
 
 noinst_LTLIBRARIES = libruntime.la libruntime-qa.la
 
@@ -31,10 +31,11 @@ libruntime_la_LIBADD =		\
 
 libruntime_la_SOURCES = 			\
 	gr_basic_block.cc			\
-	gr_simple_flowgraph.cc			\
-	gr_simple_flowgraph_detail.cc		\
+	gr_flowgraph.cc				\
+	gr_flat_flowgraph.cc			\
 	gr_block.cc				\
 	gr_block_detail.cc			\
+	gr_block_executor.cc			\
 	gr_hier_block2.cc			\
 	gr_hier_block2_detail.cc		\
 	gr_buffer.cc				\
@@ -43,18 +44,25 @@ libruntime_la_SOURCES = 			\
 	gr_io_signature.cc			\
 	gr_local_sighandler.cc			\
 	gr_message.cc				\
+	gr_msg_accepter.cc			\
 	gr_msg_handler.cc			\
 	gr_msg_queue.cc				\
 	gr_pagesize.cc				\
 	gr_preferences.cc			\
 	gr_realtime.cc				\
-	gr_runtime.cc				\
-	gr_runtime_impl.cc			\
+	gr_scheduler.cc				\
+	gr_scheduler_sts.cc			\
+	gr_scheduler_tpb.cc			\
 	gr_single_threaded_scheduler.cc		\
+	gr_sptr_magic.cc			\
 	gr_sync_block.cc			\
 	gr_sync_decimator.cc			\
 	gr_sync_interpolator.cc			\
 	gr_tmp_path.cc				\
+	gr_top_block.cc				\
+	gr_top_block_impl.cc			\
+	gr_tpb_detail.cc			\
+	gr_tpb_thread_body.cc			\
 	gr_vmcircbuf.cc				\
 	gr_vmcircbuf_mmap_shm_open.cc		\
 	gr_vmcircbuf_mmap_tmpfile.cc		\
@@ -65,17 +73,21 @@ libruntime_la_SOURCES = 			\
 libruntime_qa_la_SOURCES = 			\
 	qa_gr_block.cc				\
 	qa_gr_hier_block2.cc			\
+	qa_gr_hier_block2_derived.cc		\
 	qa_gr_buffer.cc				\
+	qa_gr_flowgraph.cc			\
+	qa_gr_top_block.cc			\
 	qa_gr_io_signature.cc			\
 	qa_gr_vmcircbuf.cc			\
 	qa_runtime.cc				
 
 grinclude_HEADERS = 				\
 	gr_basic_block.h			\
-	gr_simple_flowgraph.h			\
-	gr_simple_flowgraph_detail.h		\
+	gr_flowgraph.h				\
+	gr_flat_flowgraph.h			\
 	gr_block.h				\
 	gr_block_detail.h			\
+	gr_block_executor.h			\
 	gr_hier_block2.h			\
 	gr_hier_block2_detail.h			\
 	gr_buffer.h				\
@@ -85,22 +97,30 @@ grinclude_HEADERS = 				\
 	gr_io_signature.h			\
 	gr_local_sighandler.h			\
 	gr_message.h				\
+	gr_msg_accepter.h			\
 	gr_msg_handler.h			\
 	gr_msg_queue.h				\
 	gr_pagesize.h				\
 	gr_preferences.h			\
 	gr_realtime.h				\
-	gr_runtime.h				\
-	gr_runtime_impl.h			\
 	gr_runtime_types.h			\
+	gr_scheduler.h				\
+	gr_scheduler_sts.h			\
+	gr_scheduler_tpb.h			\
 	gr_select_handler.h			\
 	gr_single_threaded_scheduler.h		\
+	gr_sptr_magic.h				\
 	gr_sync_block.h				\
 	gr_sync_decimator.h			\
 	gr_sync_interpolator.h			\
+	gr_top_block.h				\
+	gr_top_block_impl.h			\
+	gr_tpb_detail.h				\
+	gr_tpb_thread_body.h			\
 	gr_timer.h				\
 	gr_tmp_path.h				\
 	gr_types.h				\
+	gr_unittests.h				\
 	gr_vmcircbuf.h				
 
 noinst_HEADERS = 				\
@@ -109,12 +129,16 @@ noinst_HEADERS = 				\
 	gr_vmcircbuf_sysv_shm.h			\
 	gr_vmcircbuf_createfilemapping.h	\
 	qa_gr_block.h				\
+	qa_gr_flowgraph.h			\
 	qa_gr_hier_block2.h			\
+	qa_gr_hier_block2_derived.h		\
 	qa_gr_buffer.h				\
 	qa_gr_io_signature.h			\
+	qa_gr_top_block.h			\
 	qa_gr_vmcircbuf.h			\
 	qa_runtime.h				
 
+if PYTHON
 swiginclude_HEADERS =			\
 	gr_basic_block.i		\
 	gr_block.i			\
@@ -128,11 +152,10 @@ swiginclude_HEADERS =			\
 	gr_msg_handler.i		\
 	gr_msg_queue.i			\
 	gr_realtime.i			\
-	gr_runtime.i			\
-	gr_simple_flowgraph.i		\
 	gr_single_threaded_scheduler.i	\
 	gr_sync_block.i			\
 	gr_sync_decimator.i		\
 	gr_sync_interpolator.i		\
-	gr_swig_block_magic.i		\
+	gr_top_block.i			\
 	runtime.i
+endif