diff options
author | Michael Dickens <mdickens@nd.edu> | 2010-10-09 16:11:03 -0400 |
---|---|---|
committer | Michael Dickens <mdickens@nd.edu> | 2010-10-09 21:10:10 -0400 |
commit | c6f56e4d156a6599f7530c512665a0dbb11c240b (patch) | |
tree | 667d9c012e90ae84726db939e737de8d76bc4a07 | |
parent | 32a1f42db7429d0cb51ca1cadd6896eb523d95db (diff) |
rearrange includes to always be: internal GR, external, with GR.
-rw-r--r-- | host/lib/Makefile.am | 2 | ||||
-rw-r--r-- | host/swig/Makefile.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/Makefile.am b/host/lib/Makefile.am index 23889fc..b8b60fa 100644 --- a/host/lib/Makefile.am +++ b/host/lib/Makefile.am @@ -33,7 +33,7 @@ libusrp_la_common_LIBADD = \ # 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 diff --git a/host/swig/Makefile.am b/host/swig/Makefile.am index d2e6b8b..c846f26 100644 --- a/host/swig/Makefile.am +++ b/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 # @@ -23,8 +23,8 @@ include $(top_srcdir)/Makefile.common AM_CPPFLAGS = \ $(USRP_INCLUDES) \ - $(PYTHON_CPPFLAGS) \ -I$(srcdir) \ + $(PYTHON_CPPFLAGS) \ $(USB_INCLUDES) \ $(WITH_INCLUDES) |