automake: add missing distro files and fix Ver_info.bin generation

Signed-off-by: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>

4 files changed, 18 insertions, 5 deletions

diff --git a/InfraStack/OSAgnostic/Product/AppSrvInfra/Makefile.am b/InfraStack/OSAgnostic/Product/AppSrvInfra/Makefile.am
index b5274c2..eaf3f68 100644
--- a/InfraStack/OSAgnostic/Product/AppSrvInfra/Makefile.am
+++ b/InfraStack/OSAgnostic/Product/AppSrvInfra/Makefile.am
@@ -40,7 +40,8 @@ wimaxd_SOURCES = \
 EXTRA_DIST =	$(srcdir)/i2400m.conf \
 		$(srcdir)/iwmxsdk.rules.in \
 		$(top_srcdir)/InfraStack/OSDependent/Linux/Config/config.xml.in \
-		$(top_srcdir)/InfraStack/OSDependent/Linux/Config/dhcp_renew.sh.in
+		$(top_srcdir)/InfraStack/OSDependent/Linux/Config/dhcp_renew.sh.in \
+		$(top_srcdir)/InfraStack/OSDependent/Linux/Ver_info.bin
 
 noinst_DATA = $(top_srcdir)/InfraStack/OSAgnostic/WiMax/Agents/NDnS/XML_Files/NDnSAgentConfig_forDriver.xml \
 		$(top_srcdir)/$(VER_INFO_BIN_FILE_SRC)
@@ -74,13 +75,16 @@ endif
 WiMAX_DB.bin WiMAX_Def.bin: $(WIMAX_DB_BIN_FILE)
 	cp $(WIMAX_DB_BIN_FILE) $@
 
-git_version = $(shell cd $(top_srcdir) && git describe --abbrev=128 --always)
+git_version = $(shell cd $(top_srcdir); \
+	[ -d .git ] && git describe --abbrev=128 --always && exit 0; \
+	[ -f .git_archive_txt ] && cat .git_archive.txt )
 
 # If we get here, this means the file has to be generated
 $(top_distdir)/$(VER_INFO_BIN_FILE_SRC) \
 $(top_buildir)/$(VER_INFO_BIN_FILE_SRC) \
 	::
 	@echo $@: generating distribution version
+	@chmod u+w $@
 	@[ -z "$(git_version)" ] \
 		&& echo "git-version-n/a" > $@ \
 		|| echo $(git_version) > $@
diff --git a/InfraStack/OSAgnostic/Product/AppSrvInfra/Makefile.in b/InfraStack/OSAgnostic/Product/AppSrvInfra/Makefile.in
index 91a7771..5f53296 100644
--- a/InfraStack/OSAgnostic/Product/AppSrvInfra/Makefile.in
+++ b/InfraStack/OSAgnostic/Product/AppSrvInfra/Makefile.in
@@ -291,6 +291,7 @@ wimaxd_SOURCES = \
 EXTRA_DIST = $(srcdir)/i2400m.conf $(srcdir)/iwmxsdk.rules.in \
 	$(top_srcdir)/InfraStack/OSDependent/Linux/Config/config.xml.in \
 	$(top_srcdir)/InfraStack/OSDependent/Linux/Config/dhcp_renew.sh.in \
+	$(top_srcdir)/InfraStack/OSDependent/Linux/Ver_info.bin \
 	iwmxsdk.rules.in
 noinst_DATA = $(top_srcdir)/InfraStack/OSAgnostic/WiMax/Agents/NDnS/XML_Files/NDnSAgentConfig_forDriver.xml \
 		$(top_srcdir)/$(VER_INFO_BIN_FILE_SRC)
@@ -313,7 +314,10 @@ VER_INFO_BIN_FILE_SRC = InfraStack/OSDependent/Linux/Ver_info.bin
 @BINDB_ENABLED_TRUE@WIMAX_DB_BIN_FILE = @WIMAX_DB_BIN@
 @BINDB_ENABLED_FALSE@VER_INFO_BIN_FILE = $(top_srcdir)/$(VER_INFO_BIN_FILE_SRC)
 @BINDB_ENABLED_TRUE@VER_INFO_BIN_FILE = @VER_INFO_BIN@
-git_version = $(shell cd $(top_srcdir) && git describe --abbrev=128 --always)
+git_version = $(shell cd $(top_srcdir); \
+	[ -d .git ] && git describe --abbrev=128 --always && exit 0; \
+	[ -f .git_archive_txt ] && cat .git_archive.txt )
+
 @WPA_SUP_ENABLE_FALSE@sup_lib_path = $(libdir)/wimax/libwpa_wimax_supplicant.so
 @WPA_SUP_ENABLE_TRUE@sup_lib_path = @LIBEAP0_PREFIX@/lib/libeap.so.0
 
@@ -1042,6 +1046,7 @@ $(top_distdir)/$(VER_INFO_BIN_FILE_SRC) \
 $(top_buildir)/$(VER_INFO_BIN_FILE_SRC) \
 	::
 	@echo $@: generating distribution version
+	@chmod u+w $@
 	@[ -z "$(git_version)" ] \
 		&& echo "git-version-n/a" > $@ \
 		|| echo $(git_version) > $@
diff --git a/Makefile.am b/Makefile.am
index ef719ad..6339004 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,4 +16,6 @@ SUBDIRS = \
 man_MANS = $(srcdir)/InfraStack/OSDependent/Linux/manpage/wimaxcu.1 \
 	   $(srcdir)/InfraStack/OSDependent/Linux/manpage/wimaxd.1
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(man_MANS) .gitattributes .gitignore CHANGELOG LICENSE \
+	README.txt bootstrap mk-archive
+
diff --git a/Makefile.in b/Makefile.in
index a54f546..a29e61e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -279,7 +279,9 @@ SUBDIRS = \
 man_MANS = $(srcdir)/InfraStack/OSDependent/Linux/manpage/wimaxcu.1 \
 	   $(srcdir)/InfraStack/OSDependent/Linux/manpage/wimaxd.1
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(man_MANS) .gitattributes .gitignore CHANGELOG LICENSE \
+	README.txt bootstrap mk-archive
+
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive