diff options
| author | Tom Rondeau | 2010-10-29 10:08:34 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2010-10-29 10:08:34 -0400 |
| commit | 0b9812f61b854591ec7b0f77214c3078bd5c3464 (patch) | |
| tree | 954745e7b7e6e8f47753a10526e95b0c3c3c8305 /gruel/src/lib | |
| parent | dd74b98a42f5e79c4d464cfa745b3f8af51e486e (diff) | |
| parent | cb2fa9a58c9a52f3501881964ee4f59992c5d84d (diff) | |
| download | gnuradio-0b9812f61b854591ec7b0f77214c3078bd5c3464.tar.gz gnuradio-0b9812f61b854591ec7b0f77214c3078bd5c3464.tar.bz2 gnuradio-0b9812f61b854591ec7b0f77214c3078bd5c3464.zip | |
Merge branch 'makefile_var_ordering'
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 |