diff options
| author | Ben Reynwar | 2010-11-03 22:29:09 -0700 |
|---|---|---|
| committer | Ben Reynwar | 2010-11-03 22:29:09 -0700 |
| commit | a89d85d0bff906d68ecc5293b0c45fc6170c5cb5 (patch) | |
| tree | 8d44a02ea34f65e54352ef8cb6ffbf93b4c37cac /gruel/src/lib | |
| parent | a20c127a9469aeac9ec60bf432c4128c49349f34 (diff) | |
| parent | 1fa9a8ea31115b878bff48d2259fc72d1a37b52c (diff) | |
| download | gnuradio-a89d85d0bff906d68ecc5293b0c45fc6170c5cb5.tar.gz gnuradio-a89d85d0bff906d68ecc5293b0c45fc6170c5cb5.tar.bz2 gnuradio-a89d85d0bff906d68ecc5293b0c45fc6170c5cb5.zip | |
Merge branch 'grorg-master'
Diffstat (limited to 'gruel/src/lib')
| -rw-r--r-- | gruel/src/lib/Makefile.am | 4 | ||||
| -rw-r--r-- | gruel/src/lib/msg/Makefile.am | 5 | ||||
| -rw-r--r-- | gruel/src/lib/pmt/Makefile.am | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/gruel/src/lib/Makefile.am b/gruel/src/lib/Makefile.am index 1bcd26e90..5c3302f19 100644 --- a/gruel/src/lib/Makefile.am +++ b/gruel/src/lib/Makefile.am @@ -23,8 +23,8 @@ include $(top_srcdir)/Makefile.common SUBDIRS = pmt msg -AM_CPPFLAGS = $(DEFINES) $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) $(GRUEL_INCLUDES) $(WITH_INCLUDES) - +AM_CPPFLAGS = $(DEFINES) $(GRUEL_INCLUDES) $(BOOST_CPPFLAGS) \ + $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) TESTS = test_gruel diff --git a/gruel/src/lib/msg/Makefile.am b/gruel/src/lib/msg/Makefile.am index 13a657067..9dbaf10f5 100644 --- a/gruel/src/lib/msg/Makefile.am +++ b/gruel/src/lib/msg/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2009 Free Software Foundation, Inc. +# Copyright 2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,7 +21,8 @@ include $(top_srcdir)/Makefile.common -AM_CPPFLAGS = $(DEFINES) $(BOOST_CPPFLAGS) $(GRUEL_INCLUDES) $(WITH_INCLUDES) +AM_CPPFLAGS = $(DEFINES) $(GRUEL_INCLUDES) \ + $(BOOST_CPPFLAGS) $(WITH_INCLUDES) noinst_LTLIBRARIES = libmsg.la diff --git a/gruel/src/lib/pmt/Makefile.am b/gruel/src/lib/pmt/Makefile.am index 8750cbdf8..d3efc1afa 100644 --- a/gruel/src/lib/pmt/Makefile.am +++ b/gruel/src/lib/pmt/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,8 +21,8 @@ include $(top_srcdir)/Makefile.common -AM_CPPFLAGS = $(DEFINES) $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) $(GRUEL_INCLUDES) $(WITH_INCLUDES) - +AM_CPPFLAGS = $(DEFINES) $(GRUEL_INCLUDES) $(BOOST_CPPFLAGS) \ + $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) noinst_LTLIBRARIES = libpmt.la |