rearrange includes to always be: internal GR, external, with GR.

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

diff --git a/gruel/src/lib/Makefile.am b/gruel/src/lib/Makefile.am
index bf1ae731ad357e099d59dab10a9eb9b6360419fb..5c3302f199d53a1dca51fe9e2353b98e75e23742 100644 (file)
--- a/gruel/src/lib/Makefile.am
+++ b/gruel/src/lib/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2008,2009 Free Software Foundation, Inc.
+# Copyright 2008,2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,29 +21,43 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = pmt
+SUBDIRS = pmt msg
+
+AM_CPPFLAGS = $(DEFINES) $(GRUEL_INCLUDES) $(BOOST_CPPFLAGS) \
+       $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
+
+TESTS = test_gruel
+
+noinst_PROGRAMS = test_gruel
 
-AM_CPPFLAGS = $(DEFINES) $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) $(GRUEL_INCLUDES) $(WITH_INCLUDES)
 
 lib_LTLIBRARIES = libgruel.la
 
 # magic flags
-libgruel_la_LDFLAGS = $(NO_UNDEFINED) $(BOOST_LDFLAGS) -version-info 0:0:0
+libgruel_la_LDFLAGS = $(NO_UNDEFINED) $(BOOST_LDFLAGS) $(LTVERSIONFLAGS)
 
 # ----------------------------------------------------------------
 
 PMT_LIB = pmt/libpmt.la
+MSG_LIB = msg/libmsg.la
 
 # These are the source files that go into the gruel shared library
 libgruel_la_SOURCES =                  \
        realtime.cc                     \
        sys_pri.cc                      \
+       thread.cc                       \
        thread_body_wrapper.cc          \
        thread_group.cc
 
 libgruel_la_LIBADD =                   \
        $(BOOST_THREAD_LIB)             \
        $(PMT_LIB)                      \
+       $(MSG_LIB)                      \
        -lstdc++
 
 
+# ----------------------------------------------------------------
+
+test_gruel_SOURCES = test_gruel.cc
+test_gruel_LDADD   = pmt/libpmt-qa.la libgruel.la
+