Merged features/mp-sched -r8915:9335 into the trunk. The trunk now

[debian/gnuradio] / gruel / src / lib / Makefile.am

diff --git a/gruel/src/lib/Makefile.am b/gruel/src/lib/Makefile.am
index 972ff4ca927c740c963de19ef4bd7f2b8f8bb2b3..7181c9418f2608d8a770d55f55d57c992cd7014d 100644 (file)
--- a/gruel/src/lib/Makefile.am
+++ b/gruel/src/lib/Makefile.am
@@ -21,19 +21,21 @@
 
 include $(top_srcdir)/Makefile.common
 
-AM_CPPFLAGS = $(DEFINES) $(BOOST_CFLAGS) $(GRUEL_INCLUDES) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(DEFINES) $(BOOST_CPPFLAGS) $(GRUEL_INCLUDES) $(WITH_INCLUDES)
 
 lib_LTLIBRARIES = libgruel.la
 
+# magic flags
+libgruel_la_LDFLAGS = $(NO_UNDEFINED) $(BOOST_LDFLAGS) -version-info 0:0:0
+
 # These are the source files that go into the gruel shared library
 libgruel_la_SOURCES = \
-       realtime.cc
-
-# magic flags
-libgruel_la_LDFLAGS = $(NO_UNDEFINED)
+       realtime.cc \
+       thread_body_wrapper.cc \
+       thread_group.cc
 
-# link the library against the c++ standard library
 libgruel_la_LIBADD = \
+       $(BOOST_THREAD_LIB)
        -lstdc++                        
 
 noinst_HEADERS =