| Message ID | 1437424366-30767-1-git-send-email-mike.holmes@linaro.org |
|---|---|
| State | Accepted |
| Commit | 46a04124b367f61a3419788276efc422bc3e67b8 |
| Headers | show |
On 2015-07-20 16:32, Mike Holmes wrote: > Signed-off-by: Mike Holmes <mike.holmes@linaro.org> Reviewed-by: Anders Roxell <anders.roxell@linaro.org> > --- > Makefile.inc | 1 - > bootstrap | 2 +- > configure.ac | 1 + > example/Makefile.inc | 1 - > platform/linux-generic/Makefile.am | 1 - > test/Makefile.inc | 1 - > 6 files changed, 2 insertions(+), 5 deletions(-) > delete mode 100644 Makefile.inc > > diff --git a/Makefile.inc b/Makefile.inc > deleted file mode 100644 > index fa3fac4..0000000 > --- a/Makefile.inc > +++ /dev/null > @@ -1 +0,0 @@ > -DEFAULT_INCLUDES=-I. > diff --git a/bootstrap b/bootstrap > index cd759b0..7c3d220 100755 > --- a/bootstrap > +++ b/bootstrap > @@ -3,5 +3,5 @@ set -x > aclocal -I config -I m4 > libtoolize --copy > autoheader > -automake --add-missing --copy > +automake --add-missing --copy --warnings=all > autoconf > diff --git a/configure.ac b/configure.ac > index 2ea1368..24a3fa1 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -18,6 +18,7 @@ AC_PROG_CXX > AC_PROG_INSTALL > AC_PROG_MAKE_SET > > +AM_PROG_AR > #Use libtool > LT_INIT([]) > AC_SUBST([LIBTOOL_DEPS]) > diff --git a/example/Makefile.inc b/example/Makefile.inc > index e1c1cb7..05021d4 100644 > --- a/example/Makefile.inc > +++ b/example/Makefile.inc > @@ -1,4 +1,3 @@ > -include $(top_srcdir)/Makefile.inc > include $(top_srcdir)/platform/@with_platform@/Makefile.inc > LIB = $(top_builddir)/lib > LDADD = $(LIB)/libodp.la $(LIB)/libodphelper.la > diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am > index 4ee781c..272f2d3 100644 > --- a/platform/linux-generic/Makefile.am > +++ b/platform/linux-generic/Makefile.am > @@ -1,4 +1,3 @@ > -include $(top_srcdir)/Makefile.inc > include $(top_srcdir)/platform/Makefile.inc > > AM_CFLAGS += -I$(srcdir)/include > diff --git a/test/Makefile.inc b/test/Makefile.inc > index 063ade5..d5b4770 100644 > --- a/test/Makefile.inc > +++ b/test/Makefile.inc > @@ -1,4 +1,3 @@ > -include $(top_srcdir)/Makefile.inc > include $(top_srcdir)/platform/@with_platform@/Makefile.inc > LIB = $(top_builddir)/lib > > -- > 2.1.4 > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/lng-odp
Merged, Maxim. On 07/22/15 17:34, Anders Roxell wrote: > On 2015-07-20 16:32, Mike Holmes wrote: >> Signed-off-by: Mike Holmes <mike.holmes@linaro.org> > Reviewed-by: Anders Roxell <anders.roxell@linaro.org> > >> --- >> Makefile.inc | 1 - >> bootstrap | 2 +- >> configure.ac | 1 + >> example/Makefile.inc | 1 - >> platform/linux-generic/Makefile.am | 1 - >> test/Makefile.inc | 1 - >> 6 files changed, 2 insertions(+), 5 deletions(-) >> delete mode 100644 Makefile.inc >> >> diff --git a/Makefile.inc b/Makefile.inc >> deleted file mode 100644 >> index fa3fac4..0000000 >> --- a/Makefile.inc >> +++ /dev/null >> @@ -1 +0,0 @@ >> -DEFAULT_INCLUDES=-I. >> diff --git a/bootstrap b/bootstrap >> index cd759b0..7c3d220 100755 >> --- a/bootstrap >> +++ b/bootstrap >> @@ -3,5 +3,5 @@ set -x >> aclocal -I config -I m4 >> libtoolize --copy >> autoheader >> -automake --add-missing --copy >> +automake --add-missing --copy --warnings=all >> autoconf >> diff --git a/configure.ac b/configure.ac >> index 2ea1368..24a3fa1 100644 >> --- a/configure.ac >> +++ b/configure.ac >> @@ -18,6 +18,7 @@ AC_PROG_CXX >> AC_PROG_INSTALL >> AC_PROG_MAKE_SET >> >> +AM_PROG_AR >> #Use libtool >> LT_INIT([]) >> AC_SUBST([LIBTOOL_DEPS]) >> diff --git a/example/Makefile.inc b/example/Makefile.inc >> index e1c1cb7..05021d4 100644 >> --- a/example/Makefile.inc >> +++ b/example/Makefile.inc >> @@ -1,4 +1,3 @@ >> -include $(top_srcdir)/Makefile.inc >> include $(top_srcdir)/platform/@with_platform@/Makefile.inc >> LIB = $(top_builddir)/lib >> LDADD = $(LIB)/libodp.la $(LIB)/libodphelper.la >> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am >> index 4ee781c..272f2d3 100644 >> --- a/platform/linux-generic/Makefile.am >> +++ b/platform/linux-generic/Makefile.am >> @@ -1,4 +1,3 @@ >> -include $(top_srcdir)/Makefile.inc >> include $(top_srcdir)/platform/Makefile.inc >> >> AM_CFLAGS += -I$(srcdir)/include >> diff --git a/test/Makefile.inc b/test/Makefile.inc >> index 063ade5..d5b4770 100644 >> --- a/test/Makefile.inc >> +++ b/test/Makefile.inc >> @@ -1,4 +1,3 @@ >> -include $(top_srcdir)/Makefile.inc >> include $(top_srcdir)/platform/@with_platform@/Makefile.inc >> LIB = $(top_builddir)/lib >> >> -- >> 2.1.4 >> >> _______________________________________________ >> lng-odp mailing list >> lng-odp@lists.linaro.org >> https://lists.linaro.org/mailman/listinfo/lng-odp
diff --git a/Makefile.inc b/Makefile.inc deleted file mode 100644 index fa3fac4..0000000 --- a/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -DEFAULT_INCLUDES=-I. diff --git a/bootstrap b/bootstrap index cd759b0..7c3d220 100755 --- a/bootstrap +++ b/bootstrap @@ -3,5 +3,5 @@ set -x aclocal -I config -I m4 libtoolize --copy autoheader -automake --add-missing --copy +automake --add-missing --copy --warnings=all autoconf diff --git a/configure.ac b/configure.ac index 2ea1368..24a3fa1 100644 --- a/configure.ac +++ b/configure.ac @@ -18,6 +18,7 @@ AC_PROG_CXX AC_PROG_INSTALL AC_PROG_MAKE_SET +AM_PROG_AR #Use libtool LT_INIT([]) AC_SUBST([LIBTOOL_DEPS]) diff --git a/example/Makefile.inc b/example/Makefile.inc index e1c1cb7..05021d4 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -1,4 +1,3 @@ -include $(top_srcdir)/Makefile.inc include $(top_srcdir)/platform/@with_platform@/Makefile.inc LIB = $(top_builddir)/lib LDADD = $(LIB)/libodp.la $(LIB)/libodphelper.la diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 4ee781c..272f2d3 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -1,4 +1,3 @@ -include $(top_srcdir)/Makefile.inc include $(top_srcdir)/platform/Makefile.inc AM_CFLAGS += -I$(srcdir)/include diff --git a/test/Makefile.inc b/test/Makefile.inc index 063ade5..d5b4770 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -1,4 +1,3 @@ -include $(top_srcdir)/Makefile.inc include $(top_srcdir)/platform/@with_platform@/Makefile.inc LIB = $(top_builddir)/lib
Signed-off-by: Mike Holmes <mike.holmes@linaro.org> --- Makefile.inc | 1 - bootstrap | 2 +- configure.ac | 1 + example/Makefile.inc | 1 - platform/linux-generic/Makefile.am | 1 - test/Makefile.inc | 1 - 6 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 Makefile.inc