| Message ID | 1438679443-3047-3-git-send-email-maxim.uvarov@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 08/04/15 12:21, Nicolas Morey-Chaisemartin wrote: > > On 08/04/2015 11:10 AM, Maxim Uvarov wrote: >> Platform is free to choose internal structure. No need to create Makefiles from >> common configure.ac. >> >> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> >> --- >> Makefile.am | 3 +-- >> configure.ac | 3 --- >> platform/linux-generic/m4/configure.m4 | 5 ++++- >> 3 files changed, 5 insertions(+), 6 deletions(-) >> >> diff --git a/Makefile.am b/Makefile.am >> index 7ce3a3c..c844efb 100644 >> --- a/Makefile.am >> +++ b/Makefile.am >> @@ -8,8 +8,7 @@ SUBDIRS = @platform_with_platform@ \ >> @platform_with_platform_test@ \ >> helper/test \ >> doc \ >> - example \ >> - scripts >> + example >> > Shouldn't this be part of the first patch as it also moved the Makefile.am ? > > I like this change a lot though ! > > Nicolas Ah, yes. I just sent first patch yesterday and put new patches on top. Will update that in v2. Maxim.
diff --git a/Makefile.am b/Makefile.am index 7ce3a3c..c844efb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,8 +8,7 @@ SUBDIRS = @platform_with_platform@ \ @platform_with_platform_test@ \ helper/test \ doc \ - example \ - scripts + example include $(top_srcdir)/aminclude.am diff --git a/configure.ac b/configure.ac index 8b535be..088725f 100644 --- a/configure.ac +++ b/configure.ac @@ -298,9 +298,6 @@ AC_CONFIG_FILES([Makefile helper/test/Makefile pkgconfig/libodp.pc pkgconfig/libodphelper.pc - platform/linux-generic/Makefile - platform/linux-generic/test/pktio/Makefile - platform/linux-generic/scripts/Makefile test/Makefile test/api_test/Makefile test/performance/Makefile diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 55124f1..8e6a505 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -16,4 +16,7 @@ AC_LINK_IFELSE( echo "Use newer version. For gcc > 4.7.0" exit -1) -AC_CONFIG_FILES([platform/linux-generic/test/Makefile]) +AC_CONFIG_FILES([platform/linux-generic/Makefile + platform/linux-generic/test/Makefile + platform/linux-generic/test/pktio/Makefile + platform/linux-generic/scripts/Makefile])
Platform is free to choose internal structure. No need to create Makefiles from common configure.ac. Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> --- Makefile.am | 3 +-- configure.ac | 3 --- platform/linux-generic/m4/configure.m4 | 5 ++++- 3 files changed, 5 insertions(+), 6 deletions(-)