| Message ID | 1421058363-11244-1-git-send-email-naresh.bhat@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
On 12/01/15 10:26, naresh.bhat@linaro.org wrote: > From: Naresh Bhat <naresh.bhat@linaro.org> > > Use sysroot path for json. > > Signed-off-by: Naresh Bhat <naresh.bhat@linaro.org> > --- > src/Makefile.am | 4 ++-- > src/acpica/Makefile.am | 4 ++-- > src/lib/src/Makefile.am | 4 ++-- > src/utilities/Makefile.am | 2 +- > 4 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/src/Makefile.am b/src/Makefile.am > index 11cd7c6..875b91f 100644 > --- a/src/Makefile.am > +++ b/src/Makefile.am > @@ -11,8 +11,8 @@ AM_CPPFLAGS = \ > -I$(top_srcdir)/src/acpica/source/include \ > -I$(top_srcdir)/src/acpica/source/compiler \ > -I$(top_srcdir)/efi_runtime \ > - -I/usr/include/json \ > - -I/usr/include/json-c \ > + -I=/usr/include/json \ > + -I=/usr/include/json-c \ > -pthread `pkg-config --cflags glib-2.0 gio-2.0` \ > -Wall -Werror -Wextra > > diff --git a/src/acpica/Makefile.am b/src/acpica/Makefile.am > index 26cecfc..80e6bc3 100644 > --- a/src/acpica/Makefile.am > +++ b/src/acpica/Makefile.am > @@ -8,8 +8,8 @@ AM_CPPFLAGS = \ > -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP \ > -I$(top_srcdir)/src/lib/include \ > -I$(srcdir)/source/include \ > - -I/usr/include/json \ > - -I/usr/include/json-c \ > + -I=/usr/include/json \ > + -I=/usr/include/json-c \ > -Wall -fno-strict-aliasing > > # > diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am > index 2f0bbcc..e1d9af5 100644 > --- a/src/lib/src/Makefile.am > +++ b/src/lib/src/Makefile.am > @@ -2,8 +2,8 @@ AM_CPPFLAGS = \ > -I$(top_srcdir)/src/lib/include \ > -I$(top_srcdir)/src/acpica/source/include \ > -I$(top_srcdir)/src/acpica/source/compiler \ > - -I/usr/include/json \ > - -I/usr/include/json-c \ > + -I=/usr/include/json \ > + -I=/usr/include/json-c \ > `pkg-config --cflags glib-2.0 gio-2.0` \ > -DDATAROOTDIR=\"$(datarootdir)\" \ > -Wall -Werror -Wextra > diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am > index c681676..82e8c58 100644 > --- a/src/utilities/Makefile.am > +++ b/src/utilities/Makefile.am > @@ -1,5 +1,5 @@ > AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ > - -I/usr/include/json -I/usr/include/json-c > + -I=/usr/include/json -I=/usr/include/json-c > > bin_PROGRAMS = kernelscan > kernelscan_SOURCES = kernelscan.c > Thanks Naresh, looks good to me. Acked-by: Colin Ian King <colin.king@canonical.com>
On 01/12/2015 06:26 PM, naresh.bhat@linaro.org wrote: > From: Naresh Bhat <naresh.bhat@linaro.org> > > Use sysroot path for json. > > Signed-off-by: Naresh Bhat <naresh.bhat@linaro.org> > --- > src/Makefile.am | 4 ++-- > src/acpica/Makefile.am | 4 ++-- > src/lib/src/Makefile.am | 4 ++-- > src/utilities/Makefile.am | 2 +- > 4 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/src/Makefile.am b/src/Makefile.am > index 11cd7c6..875b91f 100644 > --- a/src/Makefile.am > +++ b/src/Makefile.am > @@ -11,8 +11,8 @@ AM_CPPFLAGS = \ > -I$(top_srcdir)/src/acpica/source/include \ > -I$(top_srcdir)/src/acpica/source/compiler \ > -I$(top_srcdir)/efi_runtime \ > - -I/usr/include/json \ > - -I/usr/include/json-c \ > + -I=/usr/include/json \ > + -I=/usr/include/json-c \ > -pthread `pkg-config --cflags glib-2.0 gio-2.0` \ > -Wall -Werror -Wextra > > diff --git a/src/acpica/Makefile.am b/src/acpica/Makefile.am > index 26cecfc..80e6bc3 100644 > --- a/src/acpica/Makefile.am > +++ b/src/acpica/Makefile.am > @@ -8,8 +8,8 @@ AM_CPPFLAGS = \ > -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP \ > -I$(top_srcdir)/src/lib/include \ > -I$(srcdir)/source/include \ > - -I/usr/include/json \ > - -I/usr/include/json-c \ > + -I=/usr/include/json \ > + -I=/usr/include/json-c \ > -Wall -fno-strict-aliasing > > # > diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am > index 2f0bbcc..e1d9af5 100644 > --- a/src/lib/src/Makefile.am > +++ b/src/lib/src/Makefile.am > @@ -2,8 +2,8 @@ AM_CPPFLAGS = \ > -I$(top_srcdir)/src/lib/include \ > -I$(top_srcdir)/src/acpica/source/include \ > -I$(top_srcdir)/src/acpica/source/compiler \ > - -I/usr/include/json \ > - -I/usr/include/json-c \ > + -I=/usr/include/json \ > + -I=/usr/include/json-c \ > `pkg-config --cflags glib-2.0 gio-2.0` \ > -DDATAROOTDIR=\"$(datarootdir)\" \ > -Wall -Werror -Wextra > diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am > index c681676..82e8c58 100644 > --- a/src/utilities/Makefile.am > +++ b/src/utilities/Makefile.am > @@ -1,5 +1,5 @@ > AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ > - -I/usr/include/json -I/usr/include/json-c > + -I=/usr/include/json -I=/usr/include/json-c > > bin_PROGRAMS = kernelscan > kernelscan_SOURCES = kernelscan.c > Acked-by: Alex Hung <alex.hung@canonical.com>
diff --git a/src/Makefile.am b/src/Makefile.am index 11cd7c6..875b91f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,8 +11,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/acpica/source/include \ -I$(top_srcdir)/src/acpica/source/compiler \ -I$(top_srcdir)/efi_runtime \ - -I/usr/include/json \ - -I/usr/include/json-c \ + -I=/usr/include/json \ + -I=/usr/include/json-c \ -pthread `pkg-config --cflags glib-2.0 gio-2.0` \ -Wall -Werror -Wextra diff --git a/src/acpica/Makefile.am b/src/acpica/Makefile.am index 26cecfc..80e6bc3 100644 --- a/src/acpica/Makefile.am +++ b/src/acpica/Makefile.am @@ -8,8 +8,8 @@ AM_CPPFLAGS = \ -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP \ -I$(top_srcdir)/src/lib/include \ -I$(srcdir)/source/include \ - -I/usr/include/json \ - -I/usr/include/json-c \ + -I=/usr/include/json \ + -I=/usr/include/json-c \ -Wall -fno-strict-aliasing # diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am index 2f0bbcc..e1d9af5 100644 --- a/src/lib/src/Makefile.am +++ b/src/lib/src/Makefile.am @@ -2,8 +2,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/acpica/source/include \ -I$(top_srcdir)/src/acpica/source/compiler \ - -I/usr/include/json \ - -I/usr/include/json-c \ + -I=/usr/include/json \ + -I=/usr/include/json-c \ `pkg-config --cflags glib-2.0 gio-2.0` \ -DDATAROOTDIR=\"$(datarootdir)\" \ -Wall -Werror -Wextra diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am index c681676..82e8c58 100644 --- a/src/utilities/Makefile.am +++ b/src/utilities/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ - -I/usr/include/json -I/usr/include/json-c + -I=/usr/include/json -I=/usr/include/json-c bin_PROGRAMS = kernelscan kernelscan_SOURCES = kernelscan.c