projects
/
debian
/
gnuradio
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d74b45e
)
rearrange includes to always be: internal GR, external, with GR.
author
Michael Dickens
<mdickens@nd.edu>
Sat, 9 Oct 2010 20:11:03 +0000
(16:11 -0400)
committer
Michael Dickens
<mdickens@nd.edu>
Sun, 10 Oct 2010 01:10:10 +0000
(21:10 -0400)
19 files changed:
Makefile.common
patch
|
blob
|
history
gcell/lib/runtime/Makefile.am
patch
|
blob
|
history
gnuradio-core/src/lib/runtime/Makefile.am
patch
|
blob
|
history
gnuradio-core/src/lib/swig/Makefile.am
patch
|
blob
|
history
gnuradio-examples/c++/dial_tone/Makefile.am
patch
|
blob
|
history
gr-gcell/src/Makefile.am
patch
|
blob
|
history
gr-noaa/swig/Makefile.am
patch
|
blob
|
history
gr-pager/swig/Makefile.am
patch
|
blob
|
history
gr-qtgui/src/lib/Makefile.am
patch
|
blob
|
history
gr-usrp/apps/Makefile.am
patch
|
blob
|
history
gr-usrp/src/Makefile.am
patch
|
blob
|
history
gr-usrp2/src/Makefile.am
patch
|
blob
|
history
gruel/src/lib/Makefile.am
patch
|
blob
|
history
gruel/src/lib/msg/Makefile.am
patch
|
blob
|
history
gruel/src/lib/pmt/Makefile.am
patch
|
blob
|
history
usrp/host/lib/Makefile.am
patch
|
blob
|
history
usrp/host/swig/Makefile.am
patch
|
blob
|
history
usrp2/host/apps/Makefile.am
patch
|
blob
|
history
usrp2/host/lib/Makefile.am
patch
|
blob
|
history
diff --git
a/Makefile.common
b/Makefile.common
index fb83b9470d3640ed5793c2a5c378708d6448f6ba..95dacf987e7227573090e138ca8549fd0b1f997b 100644
(file)
--- a/
Makefile.common
+++ b/
Makefile.common
@@
-57,8
+57,8
@@
libspudir = $(libdir)spu
# This used to be set in configure.ac but is now defined here for all
# Makefiles when this fragment is included.
# This used to be set in configure.ac but is now defined here for all
# Makefiles when this fragment is included.
-STD_DEFINES_AND_INCLUDES = $(DEFINES) $(
BOOST_CPPFLAG
S) \
- $(G
NURADIO_INCLUDES) $(GRUEL_INCLUDE
S)
+STD_DEFINES_AND_INCLUDES = $(DEFINES) $(
GNURADIO_INCLUDE
S) \
+ $(G
RUEL_INCLUDES) $(BOOST_CPPFLAG
S)
# when including for compilation from pre-installed libraries and such,
# need to make sure those are put last on the compile command
# when including for compilation from pre-installed libraries and such,
# need to make sure those are put last on the compile command
diff --git
a/gcell/lib/runtime/Makefile.am
b/gcell/lib/runtime/Makefile.am
index 4d13790cd2df64b82df82ba709ec269cafbbf273..3ce637636230dcb7c44c8d105a5d2c5e2a3ae930 100644
(file)
--- a/
gcell/lib/runtime/Makefile.am
+++ b/
gcell/lib/runtime/Makefile.am
@@
-23,8
+23,8
@@
include $(top_srcdir)/Makefile.common
IBM_PPU_SYNC_INCLUDES = -I$(top_srcdir)/gcell/ibm/sync/ppu_source
IBM_PPU_SYNC_INCLUDES = -I$(top_srcdir)/gcell/ibm/sync/ppu_source
-AM_CPPFLAGS = $(DEFINES) $(
BOOST_CPPFLAGS) $(CPPUNIT
_INCLUDES) \
- $(
GCELL_INCLUDES) $(IBM_PPU_SYNC
_INCLUDES) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(DEFINES) $(
GCELL_INCLUDES) $(IBM_PPU_SYNC
_INCLUDES) \
+ $(
BOOST_CPPFLAGS) $(CPPUNIT
_INCLUDES) $(WITH_INCLUDES)
dist_bin_SCRIPTS = gcell-embedspu-libtool
dist_bin_SCRIPTS = gcell-embedspu-libtool
diff --git
a/gnuradio-core/src/lib/runtime/Makefile.am
b/gnuradio-core/src/lib/runtime/Makefile.am
index abd789a1d07a2d4d1d42b457a3267fe227358bc4..f67e8843d16518130f76296241b7ea80aa2a7ba2 100644
(file)
--- a/
gnuradio-core/src/lib/runtime/Makefile.am
+++ b/
gnuradio-core/src/lib/runtime/Makefile.am
@@
-1,5
+1,5
@@
#
#
-# Copyright 2003,2004,2007,2008,2009 Free Software Foundation, Inc.
+# Copyright 2003,2004,2007,2008,2009
,2010
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-21,7
+21,7
@@
include $(top_srcdir)/Makefile.common
include $(top_srcdir)/Makefile.common
-AM_CPPFLAGS = $(
STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(GRUEL
_INCLUDES) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(
GRUEL_INCLUDES) $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT
_INCLUDES) $(WITH_INCLUDES)
noinst_LTLIBRARIES = libruntime.la libruntime-qa.la
noinst_LTLIBRARIES = libruntime.la libruntime-qa.la
diff --git
a/gnuradio-core/src/lib/swig/Makefile.am
b/gnuradio-core/src/lib/swig/Makefile.am
index 242f27d9c0d7d9de79696ca4af39a3fc13f76ab2..1a50b8c8e90cde7fbf8ade5d4581c28fcf575de2 100644
(file)
--- a/
gnuradio-core/src/lib/swig/Makefile.am
+++ b/
gnuradio-core/src/lib/swig/Makefile.am
@@
-1,5
+1,5
@@
#
#
-# Copyright 2001,2003,2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc.
+# Copyright 2001,2003,2004,2005,2006,2007,2008,2009
,2010
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-22,7
+22,7
@@
include $(top_srcdir)/Makefile.common
if PYTHON
include $(top_srcdir)/Makefile.common
if PYTHON
-AM_CPPFLAGS =
$(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir
) \
+AM_CPPFLAGS =
-I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS
) \
$(WITH_INCLUDES)
EXTRA_DIST = gen-swig-bug-fix
$(WITH_INCLUDES)
EXTRA_DIST = gen-swig-bug-fix
diff --git
a/gnuradio-examples/c++/dial_tone/Makefile.am
b/gnuradio-examples/c++/dial_tone/Makefile.am
index ea34beee865d8df781de72f3b6a18f17c7b85b95..188275fcaf43ab78cdbb1dc18bf6e412d7c68267 100644
(file)
--- a/
gnuradio-examples/c++/dial_tone/Makefile.am
+++ b/
gnuradio-examples/c++/dial_tone/Makefile.am
@@
-1,5
+1,5
@@
#
#
-# Copyright 2006,2008,2009 Free Software Foundation, Inc.
+# Copyright 2006,2008,2009
,2010
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-22,9
+22,10
@@
include $(top_srcdir)/Makefile.common
# For compiling within the GNU Radio build tree
include $(top_srcdir)/Makefile.common
# For compiling within the GNU Radio build tree
-AM_CPPFLAGS=$(STD_DEFINES_AND_INCLUDES) \
- -I$(top_srcdir)/gr-audio-alsa/src \
- $(WITH_INCLUDES)
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/gr-audio-alsa/src \
+ $(STD_DEFINES_AND_INCLUDES) \
+ $(WITH_INCLUDES)
GR_AUDIO_ALSA_LA=$(top_builddir)/gr-audio-alsa/src/libgnuradio-audio-alsa.la
GR_AUDIO_ALSA_LA=$(top_builddir)/gr-audio-alsa/src/libgnuradio-audio-alsa.la
diff --git
a/gr-gcell/src/Makefile.am
b/gr-gcell/src/Makefile.am
index 63dc156b1162722ce611b382a30617281072ed33..60ec6cc731ce9b785ec6b84f686f27fae40195b0 100644
(file)
--- a/
gr-gcell/src/Makefile.am
+++ b/
gr-gcell/src/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
#
#
# This file is part of GNU Radio
#
@@
-22,7
+22,7
@@
include $(top_srcdir)/Makefile.common
SUBDIRS = . examples
SUBDIRS = . examples
-AM_CPPFLAGS = $(
STD_DEFINES_AND_INCLUDES) $(GCELL
_INCLUDES) \
+AM_CPPFLAGS = $(
GCELL_INCLUDES) $(STD_DEFINES_AND
_INCLUDES) \
$(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
# ----------------------------------------------------------------
$(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
# ----------------------------------------------------------------
diff --git
a/gr-noaa/swig/Makefile.am
b/gr-noaa/swig/Makefile.am
index 73645e92bf2ee16d5260c6d4cb5f49499ebaafa8..410b23fe603e038c76cc75d54374e0ef423cdc00 100644
(file)
--- a/
gr-noaa/swig/Makefile.am
+++ b/
gr-noaa/swig/Makefile.am
@@
-1,5
+1,5
@@
#
#
-# Copyright 2004,2005,2006,2008,2009 Free Software Foundation, Inc.
+# Copyright 2004,2005,2006,2008,2009
,2010
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-22,10
+22,10
@@
include $(top_srcdir)/Makefile.common
AM_CPPFLAGS = \
include $(top_srcdir)/Makefile.common
AM_CPPFLAGS = \
+ -I$(top_srcdir)/gr-noaa/lib \
$(STD_DEFINES_AND_INCLUDES) \
$(PYTHON_CPPFLAGS) \
$(STD_DEFINES_AND_INCLUDES) \
$(PYTHON_CPPFLAGS) \
- $(WITH_INCLUDES) \
- -I$(top_srcdir)/gr-noaa/lib
+ $(WITH_INCLUDES)
if PYTHON
# ----------------------------------------------------------------
if PYTHON
# ----------------------------------------------------------------
diff --git
a/gr-pager/swig/Makefile.am
b/gr-pager/swig/Makefile.am
index 9e1a4521935ab1b6fb22e5355bd6cc6ef32a132f..c59bdb0f2ca27665bc12958bc0202c7fd51cef62 100644
(file)
--- a/
gr-pager/swig/Makefile.am
+++ b/
gr-pager/swig/Makefile.am
@@
-1,5
+1,5
@@
#
#
-# Copyright 2004,2005,2006,2008,2009 Free Software Foundation, Inc.
+# Copyright 2004,2005,2006,2008,2009
,2010
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-22,10
+22,10
@@
include $(top_srcdir)/Makefile.common
AM_CPPFLAGS = \
include $(top_srcdir)/Makefile.common
AM_CPPFLAGS = \
+ -I$(top_srcdir)/gr-pager/lib \
$(STD_DEFINES_AND_INCLUDES) \
$(PYTHON_CPPFLAGS) \
$(STD_DEFINES_AND_INCLUDES) \
$(PYTHON_CPPFLAGS) \
- $(WITH_INCLUDES) \
- -I$(top_srcdir)/gr-pager/lib
+ $(WITH_INCLUDES)
##############################
# SWIG interface and library
##############################
# SWIG interface and library
diff --git
a/gr-qtgui/src/lib/Makefile.am
b/gr-qtgui/src/lib/Makefile.am
index 4ba637ad642e988399d62f99fff626b1ed42d283..1ee3c8e3d282eebbfcc17e33f9e6c10db69838ae 100644
(file)
--- a/
gr-qtgui/src/lib/Makefile.am
+++ b/
gr-qtgui/src/lib/Makefile.am
@@
-21,8
+21,8
@@
include $(top_srcdir)/Makefile.common
include $(top_srcdir)/Makefile.common
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
- $(QT_INCLUDES)
-I.
$(WITH_INCLUDES)
+AM_CPPFLAGS =
-I.
$(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
+ $(QT_INCLUDES) $(WITH_INCLUDES)
# Only include these files in the build if qtgui passes configure checks
# This is mostly to help make distcheck pass
# Only include these files in the build if qtgui passes configure checks
# This is mostly to help make distcheck pass
diff --git
a/gr-usrp/apps/Makefile.am
b/gr-usrp/apps/Makefile.am
index 92938061f6e1062ecdd876431d6ef303c0a1ce01..0f3a21bb4ed68e875a6a0aa3ed5df0c08cedc6c7 100644
(file)
--- a/
gr-usrp/apps/Makefile.am
+++ b/
gr-usrp/apps/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
#
#
# This file is part of GNU Radio
#
@@
-22,19
+22,20
@@
include $(top_srcdir)/Makefile.common
# For compiling within the GNU Radio build tree
include $(top_srcdir)/Makefile.common
# For compiling within the GNU Radio build tree
-AM_CPPFLAGS=$(STD_DEFINES_AND_INCLUDES) \
- -I$(top_srcdir)/gr-usrp/src \
- $(USRP_INCLUDES) \
- $(WITH_INCLUDES)
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/gr-usrp/src \
+ $(USRP_INCLUDES) \
+ $(STD_DEFINES_AND_INCLUDES) \
+ $(WITH_INCLUDES)
GR_USRP_LA=$(top_builddir)/gr-usrp/src/libgnuradio-usrp.la
# For compiling outside the tree, these will get fished out by pkgconfig
LDADD = \
GR_USRP_LA=$(top_builddir)/gr-usrp/src/libgnuradio-usrp.la
# For compiling outside the tree, these will get fished out by pkgconfig
LDADD = \
+ $(GR_USRP_LA) \
$(BOOST_LDFLAGS) \
$(BOOST_LDFLAGS) \
- $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(GR_USRP_LA)
+ $(BOOST_PROGRAM_OPTIONS_LIB)
noinst_PROGRAMS = \
usrp_rx_cfile \
noinst_PROGRAMS = \
usrp_rx_cfile \
diff --git
a/gr-usrp/src/Makefile.am
b/gr-usrp/src/Makefile.am
index 572a22485b89d7b8863bf215c8668f568c76b433..db5be4adedec59da85395fb6c32cb3cf3ab094c2 100644
(file)
--- a/
gr-usrp/src/Makefile.am
+++ b/
gr-usrp/src/Makefile.am
@@
-1,5
+1,5
@@
#
#
-# Copyright 2004,2005,2006,2008,2009 Free Software Foundation, Inc.
+# Copyright 2004,2005,2006,2008,2009
,2010
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-34,9
+34,9
@@
noinst_PYTHON = qa_usrp.py
# The straight C++ library
AM_CPPFLAGS = \
# The straight C++ library
AM_CPPFLAGS = \
+ $(USRP_INCLUDES) \
$(STD_DEFINES_AND_INCLUDES) \
$(PYTHON_CPPFLAGS) \
$(STD_DEFINES_AND_INCLUDES) \
$(PYTHON_CPPFLAGS) \
- $(USRP_INCLUDES) \
$(USB_INCLUDES) \
$(WITH_INCLUDES)
$(USB_INCLUDES) \
$(WITH_INCLUDES)
diff --git
a/gr-usrp2/src/Makefile.am
b/gr-usrp2/src/Makefile.am
index 03b6d0dd9d15c0747c1ef32201efe66aca95031a..0d55d73ba6468c6ba5fc39955022984c04867b2c 100644
(file)
--- a/
gr-usrp2/src/Makefile.am
+++ b/
gr-usrp2/src/Makefile.am
@@
-1,5
+1,5
@@
#
#
-# Copyright 2004,2005,2006,2008,2009 Free Software Foundation, Inc.
+# Copyright 2004,2005,2006,2008,2009
,2010
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-42,10
+42,10
@@
DISTCLEANFILES = run_tests
# libgr-usrp.so
# ----------------------------------------------------------------------
AM_CPPFLAGS = \
# libgr-usrp.so
# ----------------------------------------------------------------------
AM_CPPFLAGS = \
- $(STD_DEFINES_AND_INCLUDES) \
$(GRUEL_INCLUDES) \
$(GRUEL_INCLUDES) \
- $(PYTHON_CPPFLAGS) \
$(USRP2_INCLUDES) \
$(USRP2_INCLUDES) \
+ $(STD_DEFINES_AND_INCLUDES) \
+ $(PYTHON_CPPFLAGS) \
$(WITH_INCLUDES)
lib_LTLIBRARIES = libgnuradio-usrp2.la
$(WITH_INCLUDES)
lib_LTLIBRARIES = libgnuradio-usrp2.la
diff --git
a/gruel/src/lib/Makefile.am
b/gruel/src/lib/Makefile.am
index 1bcd26e90717feed2d578c59dcddcb7519d77adc..5c3302f199d53a1dca51fe9e2353b98e75e23742 100644
(file)
--- a/
gruel/src/lib/Makefile.am
+++ b/
gruel/src/lib/Makefile.am
@@
-23,8
+23,8
@@
include $(top_srcdir)/Makefile.common
SUBDIRS = pmt msg
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
TESTS = test_gruel
diff --git
a/gruel/src/lib/msg/Makefile.am
b/gruel/src/lib/msg/Makefile.am
index 13a657067472865f3fec4a94ea7761740a6dcf97..9dbaf10f5323f9583dc754493a18d164644cadf1 100644
(file)
--- 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
#
#
# This file is part of GNU Radio
#
@@
-21,7
+21,8
@@
include $(top_srcdir)/Makefile.common
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
noinst_LTLIBRARIES = libmsg.la
diff --git
a/gruel/src/lib/pmt/Makefile.am
b/gruel/src/lib/pmt/Makefile.am
index 8750cbdf8370788fdafbebbc6e9ef5d6efddd58e..d3efc1afa3093ae97ff15f3361809a821d453388 100644
(file)
--- 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
#
#
# This file is part of GNU Radio
#
@@
-21,8
+21,8
@@
include $(top_srcdir)/Makefile.common
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
noinst_LTLIBRARIES = libpmt.la
diff --git
a/usrp/host/lib/Makefile.am
b/usrp/host/lib/Makefile.am
index 23889fc85a25822b313dcb62883c0f08a684c028..b8b60fa98407ab4615ca24e0ce5b7ecacbd10c11 100644
(file)
--- a/
usrp/host/lib/Makefile.am
+++ b/
usrp/host/lib/Makefile.am
@@
-33,7
+33,7
@@
libusrp_la_common_LIBADD = \
# darwin fusb requires gruel (for threading)
if FUSB_TECH_darwin
# darwin fusb requires gruel (for threading)
if FUSB_TECH_darwin
-AM_CPPFLAGS = $(
common_INCLUDES) $(GRUEL
_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(
GRUEL_INCLUDES) $(common
_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES)
libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(GRUEL_LA)
libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS) -framework CoreFoundation
else
libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(GRUEL_LA)
libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS) -framework CoreFoundation
else
diff --git
a/usrp/host/swig/Makefile.am
b/usrp/host/swig/Makefile.am
index d2e6b8bc10be5e7c6b0f0bbd37b5b88e02456e81..c846f267bd9f7292d12e33439a4c394d71183dfe 100644
(file)
--- a/
usrp/host/swig/Makefile.am
+++ b/
usrp/host/swig/Makefile.am
@@
-1,5
+1,5
@@
#
#
-# Copyright 2001,2003,2004,2006,2007,2008,2009 Free Software Foundation, Inc.
+# Copyright 2001,2003,2004,2006,2007,2008,2009
,2010
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-23,8
+23,8
@@
include $(top_srcdir)/Makefile.common
AM_CPPFLAGS = \
$(USRP_INCLUDES) \
AM_CPPFLAGS = \
$(USRP_INCLUDES) \
- $(PYTHON_CPPFLAGS) \
-I$(srcdir) \
-I$(srcdir) \
+ $(PYTHON_CPPFLAGS) \
$(USB_INCLUDES) \
$(WITH_INCLUDES)
$(USB_INCLUDES) \
$(WITH_INCLUDES)
diff --git
a/usrp2/host/apps/Makefile.am
b/usrp2/host/apps/Makefile.am
index 4a26898fa7d9f5303f7b3f91ec5bc648d79ff9ee..087ab9e311d96f46696cdcd30f89b8c9fbc72f7d 100644
(file)
--- a/
usrp2/host/apps/Makefile.am
+++ b/
usrp2/host/apps/Makefile.am
@@
-1,5
+1,5
@@
#
#
-# Copyright 2007,
2008
Free Software Foundation, Inc.
+# Copyright 2007,
2008,2010
Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-19,9
+19,9
@@
include $(top_srcdir)/Makefile.common
AM_CPPFLAGS = \
$(USRP2_INCLUDES) \
AM_CPPFLAGS = \
$(USRP2_INCLUDES) \
+ $(GRUEL_INCLUDES) \
$(STD_DEFINES_AND_INCLUDES) \
$(STD_DEFINES_AND_INCLUDES) \
- $(CPPUNIT_INCLUDES) \
- $(GRUEL_INCLUDES)
+ $(CPPUNIT_INCLUDES)
LDADD = \
$(USRP2_LA) \
LDADD = \
$(USRP2_LA) \
diff --git
a/usrp2/host/lib/Makefile.am
b/usrp2/host/lib/Makefile.am
index 209cb70953d88886b2aa1759c88cde1f443c8cbd..85bec4673680f58bff173f95e8beae47ad38e6b2 100644
(file)
--- a/
usrp2/host/lib/Makefile.am
+++ b/
usrp2/host/lib/Makefile.am
@@
-19,10
+19,10
@@
include $(top_srcdir)/Makefile.common
AM_CPPFLAGS = \
$(USRP2_INCLUDES) \
AM_CPPFLAGS = \
$(USRP2_INCLUDES) \
- $(
BOOST_CPPFLAG
S) \
+ $(
GRUEL_INCLUDE
S) \
$(STD_DEFINES_AND_INCLUDES) \
$(STD_DEFINES_AND_INCLUDES) \
- $(
CPPUNIT_INCLUDE
S) \
- $(
GRUEL_INCLUDES)
+ $(
BOOST_CPPFLAG
S) \
+ $(
CPPUNIT_INCLUDES)
bin_PROGRAMS = usrp2_socket_opener
usrp2_socket_opener_SOURCES = usrp2_socket_opener.cc
bin_PROGRAMS = usrp2_socket_opener
usrp2_socket_opener_SOURCES = usrp2_socket_opener.cc