diff mbox

[1/4] linux-generic: move git_hash.sh under linux-generic directory

Message ID 1438679443-3047-2-git-send-email-maxim.uvarov@linaro.org
State New
Headers show

Commit Message

Maxim Uvarov Aug. 4, 2015, 9:10 a.m. UTC
git_hash.sh is used to generate version string. Each platform
should have it's own version of that script.

Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Reviewed-by: Mike Holmes <mike.holmes@linaro.org>
---
 configure.ac                                            | 2 +-
 platform/Makefile.inc                                   | 2 +-
 {scripts => platform/linux-generic/scripts}/Makefile.am | 0
 {scripts => platform/linux-generic/scripts}/git_hash.sh | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename {scripts => platform/linux-generic/scripts}/Makefile.am (100%)
 rename {scripts => platform/linux-generic/scripts}/git_hash.sh (100%)

diff --git a/scripts/Makefile.am b/platform/linux-generic/scripts/Makefile.am
similarity index 100%
rename from scripts/Makefile.am
rename to platform/linux-generic/scripts/Makefile.am
diff --git a/scripts/git_hash.sh b/platform/linux-generic/scripts/git_hash.sh
similarity index 100%
rename from scripts/git_hash.sh
rename to platform/linux-generic/scripts/git_hash.sh
diff mbox

Patch

diff --git a/configure.ac b/configure.ac
index 24a3fa1..8b535be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -300,7 +300,7 @@  AC_CONFIG_FILES([Makefile
 		 pkgconfig/libodphelper.pc
 		 platform/linux-generic/Makefile
 		 platform/linux-generic/test/pktio/Makefile
-		 scripts/Makefile
+		 platform/linux-generic/scripts/Makefile
 		 test/Makefile
 		 test/api_test/Makefile
 		 test/performance/Makefile
diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index f64e37c..f26a8c5 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -12,6 +12,6 @@  lib_LTLIBRARIES = $(LIB)/libodp.la
 
 AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)'
 
-GIT_DESC = `$(top_srcdir)/scripts/git_hash.sh`
+GIT_DESC = `$(top_srcdir)/platform/linux-generic/scripts/git_hash.sh`
 AM_CFLAGS += "-DGIT_HASH=$(GIT_DESC)"
 AM_CFLAGS += -DPLATFORM=${with_platform}