projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added include <cstdio> statements in several files to make it compatible with g+...
[debian/gnuradio]
/
mblock
/
src
/
lib
/
Makefile.am
diff --git
a/mblock/src/lib/Makefile.am
b/mblock/src/lib/Makefile.am
index 86cacb1ad994849e514bf08c117f2eb0386a41ff..81079f032a480e3db5178638aa055a04b861bc9c 100644
(file)
--- 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
#
#
# This file is part of GNU Radio
#
@@
-21,7
+21,9
@@
include $(top_srcdir)/Makefile.common
include $(top_srcdir)/Makefile.common
-INCLUDES = $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES)
+AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) \
+ $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) \
+ $(MBLOCK_INCLUDES)
# disable test until we fix ticket:180
# TESTS = test_mblock
# disable test until we fix ticket:180
# TESTS = test_mblock
@@
-60,7
+62,6
@@
libmblock_la_SOURCES = \
mb_runtime_base.cc \
mb_runtime_nop.cc \
mb_runtime_thread_per_block.cc \
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
mb_timer_queue.cc \
mb_util.cc \
mb_worker.cc
@@
-75,25
+76,11
@@
libmblock_la_LIBADD = \
$(PMT_LA) \
-lstdc++
$(PMT_LA) \
-lstdc++
-include_HEADERS = \
- mb_class_registry.h \
- mb_common.h \
- mb_exception.h \
+noinst_HEADERS = \
mb_gettid.h \
mb_gettid.h \
- mb_mblock.h \
- mb_message.h \
- mb_msg_accepter.h \
mb_msg_accepter_msgq.h \
mb_msg_accepter_msgq.h \
- mb_msg_queue.h \
- mb_port.h \
mb_port_simple.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 \
mb_connection.h \
mb_endpoint.h \
mb_mblock_impl.h \
@@
-143,5
+130,3
@@
test_mblock_LDADD = libmblock-qa.la
benchmark_send_SOURCES = benchmark_send.cc
benchmark_send_LDADD = libmblock-qa.la
benchmark_send_SOURCES = benchmark_send.cc
benchmark_send_LDADD = libmblock-qa.la
-
-CLEANFILES = $(BUILT_SOURCES) *.pyc