build: Move generated version.h to a waf-invisible location

Generally, it is better if our generated header files for the autoconf
build do not end up in places that the waf build can see.

Andrew Bartlett

diff --git a/.gitignore b/.gitignore
index d8cb4e7577cb0acbf32228a327433ded3360bf31..4d927a9c234ee1a5f7407e7259206366ddeff14e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -76,7 +76,7 @@ source3/include/autoconf/config.h
 source3/include/autoconf/config.h.in
 source3/include/includes.h.gch
 source3/include/stamp-h
-source3/include/version.h
+source3/include/autoconf/version.h
 source3/lib/netapi/examples/Makefile
 source3/lib/netapi/tests/Makefile
 source3/library-versions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index a40154355bc4efad950edef6700dd8d176ac1634..76477e780a798d3fbc27d5f181c59d78c4067b8a 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1837,7 +1837,7 @@ lib/pidfile.o: lib/pidfile.c
                echo "$(COMPILE_CC_PATH)" 1>&2;\
                $(COMPILE_CC_PATH) >/dev/null 2>&1
 
-lib/version.o: lib/version.c include/version.h
+lib/version.o: lib/version.c include/autoconf/version.h
        @echo Compiling $*.c
        @$(COMPILE_CC_PATH) && exit 0;\
                echo "The following command failed:" 1>&2;\

diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh
index d8ba8af008e74b7df7db174543805e6a583802c1..e6b375e6132f5a1d564d44483f8612cba0182e3b 100755 (executable)
--- a/source3/script/mkversion.sh
+++ b/source3/script/mkversion.sh
@@ -8,7 +8,7 @@ if test -z "$VERSION_FILE";then
 fi
 
 if test -z "$OUTPUT_FILE";then
-       OUTPUT_FILE="include/version.h"
+       OUTPUT_FILE="include/autoconf/version.h"
 fi
 
 SOURCE_DIR=$3