diff mbox

[v2] tools/iio: Use include/uapi with __EXPORTED_HEADERS__

Message ID 5cfc29b0d8fa6c5bd97e59f7ab0ff718132efdec.1492777014.git.nsekhar@ti.com
State Accepted
Commit c36662193b4e2e37e0e2084ca34585478526fa88
Headers show

Commit Message

Sekhar Nori April 21, 2017, 12:31 p.m. UTC
Use the local uapi headers to keep in sync with "recently" added enum
values like IIO_UVINDEX.

Build tested using:
$ make -C <kernelsrcdir> tools/iio
$ make -C <kernelsrcdir>/tools iio
$ make -C <kernelsrcdir>/tools/iio

This follows a strategy similar to that used by tools/hv, tools/net and
tools/leds among others.

Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

---
Change since v1:
Shift to a strategy similar to that used by other makefiles in
tools/ folder. v1 posting here: https://patchwork.kernel.org/patch/9674937/

 tools/iio/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.9.0

Comments

Randy Dunlap April 23, 2017, 2:22 a.m. UTC | #1
On 04/21/17 05:31, Sekhar Nori wrote:
> Use the local uapi headers to keep in sync with "recently" added enum

> values like IIO_UVINDEX.

> 

> Build tested using:

> $ make -C <kernelsrcdir> tools/iio

> $ make -C <kernelsrcdir>/tools iio

> $ make -C <kernelsrcdir>/tools/iio


Hi,
Did you do any testing with O=<outputdir> ?

Thanks.

> This follows a strategy similar to that used by tools/hv, tools/net and

> tools/leds among others.

> 

> Cc: Randy Dunlap <rdunlap@infradead.org>

> Cc: Jonathan Cameron <jic23@kernel.org>

> Signed-off-by: Sekhar Nori <nsekhar@ti.com>

> ---

> Change since v1:

> Shift to a strategy similar to that used by other makefiles in

> tools/ folder. v1 posting here: https://patchwork.kernel.org/patch/9674937/

> 

>  tools/iio/Makefile | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/tools/iio/Makefile b/tools/iio/Makefile

> index 5446d625e17d..8f08e03a9a5e 100644

> --- a/tools/iio/Makefile

> +++ b/tools/iio/Makefile

> @@ -1,5 +1,5 @@

>  CC = $(CROSS_COMPILE)gcc

> -CFLAGS += -Wall -g -D_GNU_SOURCE

> +CFLAGS += -Wall -g -D_GNU_SOURCE -D__EXPORTED_HEADERS__ -I../../include/uapi -I../../include

>  

>  BINDIR=usr/bin

>  INSTALL_PROGRAM=install -m 755 -p

> 



-- 
~Randy
Sekhar Nori April 24, 2017, 11:40 a.m. UTC | #2
Hi Randy,

On Sunday 23 April 2017 07:52 AM, Randy Dunlap wrote:
> On 04/21/17 05:31, Sekhar Nori wrote:

>> Use the local uapi headers to keep in sync with "recently" added enum

>> values like IIO_UVINDEX.

>>

>> Build tested using:

>> $ make -C <kernelsrcdir> tools/iio

>> $ make -C <kernelsrcdir>/tools iio

>> $ make -C <kernelsrcdir>/tools/iio

> 

> Hi,

> Did you do any testing with O=<outputdir> ?


I hadn't, but I just checked with:

$ make -C <kernelsrcdir>/tools iio O=<outputdir>

Although there is an iio folder created under <outputdir>, the actual
binaries are still built under <kernelsrcdir>/tools/iio. So I think
there is some more work to be done to respect the O= option passed from
command line.

The behavior remains same with or without my patch.

Thanks,
Sekhar
Randy Dunlap April 24, 2017, 3:30 p.m. UTC | #3
On 04/24/17 04:40, Sekhar Nori wrote:
> Hi Randy,

> 

> On Sunday 23 April 2017 07:52 AM, Randy Dunlap wrote:

>> On 04/21/17 05:31, Sekhar Nori wrote:

>>> Use the local uapi headers to keep in sync with "recently" added enum

>>> values like IIO_UVINDEX.

>>>

>>> Build tested using:

>>> $ make -C <kernelsrcdir> tools/iio

>>> $ make -C <kernelsrcdir>/tools iio

>>> $ make -C <kernelsrcdir>/tools/iio

>>

>> Hi,

>> Did you do any testing with O=<outputdir> ?

> 

> I hadn't, but I just checked with:

> 

> $ make -C <kernelsrcdir>/tools iio O=<outputdir>

> 

> Although there is an iio folder created under <outputdir>, the actual

> binaries are still built under <kernelsrcdir>/tools/iio. So I think

> there is some more work to be done to respect the O= option passed from

> command line.

> 

> The behavior remains same with or without my patch.


Yes, agreed.  This is a common problem in tools.

Thanks.

-- 
~Randy
Jonathan Cameron April 27, 2017, 5:33 a.m. UTC | #4
On 21/04/17 13:31, Sekhar Nori wrote:
> Use the local uapi headers to keep in sync with "recently" added enum

> values like IIO_UVINDEX.

> 

> Build tested using:

> $ make -C <kernelsrcdir> tools/iio

> $ make -C <kernelsrcdir>/tools iio

> $ make -C <kernelsrcdir>/tools/iio

> 

> This follows a strategy similar to that used by tools/hv, tools/net and

> tools/leds among others.

> 

> Cc: Randy Dunlap <rdunlap@infradead.org>

> Cc: Jonathan Cameron <jic23@kernel.org>

> Signed-off-by: Sekhar Nori <nsekhar@ti.com>

Applied to the togreg branch of iio.git and pushed out as testing for the
autobuilders to ignore it.

Jonathan
> ---

> Change since v1:

> Shift to a strategy similar to that used by other makefiles in

> tools/ folder. v1 posting here: https://patchwork.kernel.org/patch/9674937/

> 

>  tools/iio/Makefile | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/tools/iio/Makefile b/tools/iio/Makefile

> index 5446d625e17d..8f08e03a9a5e 100644

> --- a/tools/iio/Makefile

> +++ b/tools/iio/Makefile

> @@ -1,5 +1,5 @@

>  CC = $(CROSS_COMPILE)gcc

> -CFLAGS += -Wall -g -D_GNU_SOURCE

> +CFLAGS += -Wall -g -D_GNU_SOURCE -D__EXPORTED_HEADERS__ -I../../include/uapi -I../../include

>  

>  BINDIR=usr/bin

>  INSTALL_PROGRAM=install -m 755 -p

>
diff mbox

Patch

diff --git a/tools/iio/Makefile b/tools/iio/Makefile
index 5446d625e17d..8f08e03a9a5e 100644
--- a/tools/iio/Makefile
+++ b/tools/iio/Makefile
@@ -1,5 +1,5 @@ 
 CC = $(CROSS_COMPILE)gcc
-CFLAGS += -Wall -g -D_GNU_SOURCE
+CFLAGS += -Wall -g -D_GNU_SOURCE -D__EXPORTED_HEADERS__ -I../../include/uapi -I../../include
 
 BINDIR=usr/bin
 INSTALL_PROGRAM=install -m 755 -p