mirror of https://gerrit.osmocom.org/libusrp
rearrange includes to always be: internal GR, external, with GR.
This commit is contained in:
parent
32a1f42db7
commit
c6f56e4d15
|
@ -33,7 +33,7 @@ libusrp_la_common_LIBADD = \
|
||||||
|
|
||||||
# darwin fusb requires gruel (for threading)
|
# darwin fusb requires gruel (for threading)
|
||||||
if FUSB_TECH_darwin
|
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_LIBADD = $(libusrp_la_common_LIBADD) $(GRUEL_LA)
|
||||||
libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS) -framework CoreFoundation
|
libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS) -framework CoreFoundation
|
||||||
else
|
else
|
||||||
|
|
|
@ -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 = \
|
AM_CPPFLAGS = \
|
||||||
$(USRP_INCLUDES) \
|
$(USRP_INCLUDES) \
|
||||||
$(PYTHON_CPPFLAGS) \
|
|
||||||
-I$(srcdir) \
|
-I$(srcdir) \
|
||||||
|
$(PYTHON_CPPFLAGS) \
|
||||||
$(USB_INCLUDES) \
|
$(USB_INCLUDES) \
|
||||||
$(WITH_INCLUDES)
|
$(WITH_INCLUDES)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue