X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=mblock%2Fsrc%2Flib%2FMakefile.am;h=dbdfcdd9d5538bb7ff5dd57895b62d95203b5605;hb=a178f23be75489c1507060a8b0e9e59cd358dfba;hp=9a653759de79cf8bcae9106e643f2f5a6d08fa10;hpb=c3afdef49407739ab106cae31b0899eaaf32aacc;p=debian%2Fgnuradio

diff --git a/mblock/src/lib/Makefile.am b/mblock/src/lib/Makefile.am
index 9a653759..dbdfcdd9 100644
--- a/mblock/src/lib/Makefile.am
+++ b/mblock/src/lib/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2006,2007 Free Software Foundation, Inc.
+# Copyright 2006,2007,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,9 +21,12 @@
 
 include $(top_srcdir)/Makefile.common
 
-INCLUDES = $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES)
+AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) $(GRUEL_INCLUDES) \
+	$(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) \
+	$(MBLOCK_INCLUDES)
 
-TESTS = test_mblock
+# disable test until we fix ticket:180
+# TESTS = test_mblock
 
 lib_LTLIBRARIES = libmblock.la libmblock-qa.la
 
@@ -59,7 +62,6 @@ libmblock_la_SOURCES =			\
 	mb_runtime_base.cc		\
 	mb_runtime_nop.cc		\
 	mb_runtime_thread_per_block.cc	\
-	mb_time.cc			\
 	mb_timer_queue.cc		\
 	mb_util.cc			\
 	mb_worker.cc			
@@ -71,28 +73,14 @@ libmblock_la_LDFLAGS = $(NO_UNDEFINED)
 # link the library against the c++ standard library
 libmblock_la_LIBADD = 			\
 	$(OMNITHREAD_LA)		\
-	$(PMT_LA)			\
+	$(GRUEL_LA)			\
 	-lstdc++			
 
-include_HEADERS =			\
-	mb_class_registry.h		\
-	mb_common.h			\
-	mb_exception.h			\
+noinst_HEADERS =			\
 	mb_gettid.h			\
-	mb_mblock.h			\
-	mb_message.h			\
-	mb_msg_accepter.h		\
 	mb_msg_accepter_msgq.h		\
-	mb_msg_queue.h			\
-	mb_port.h			\
 	mb_port_simple.h		\
-	mb_protocol_class.h		\
-	mb_runtime.h			\
-	mb_time.h			\
-	mb_util.h			
-
-
-noinst_HEADERS = 			\
+	mb_util.h			\
 	mb_connection.h			\
 	mb_endpoint.h			\
 	mb_mblock_impl.h		\
@@ -142,5 +130,3 @@ test_mblock_LDADD   = libmblock-qa.la
 
 benchmark_send_SOURCES = benchmark_send.cc
 benchmark_send_LDADD   = libmblock-qa.la
-
-CLEANFILES = $(BUILT_SOURCES) *.pyc