summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-05-17 16:43:48 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-05-18 15:44:43 +1000
commit584a51b2ca891c5546c7e9ee8f039bfeb4d6a319 (patch)
treed5db8fd06b682503715447af4f4c3d2e283f19bb
parent01c502ddd41857e2dea9a01ac4afbe48e5ea1fdd (diff)
downloadsamba-584a51b2ca891c5546c7e9ee8f039bfeb4d6a319.tar.gz
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
-rw-r--r--.gitignore2
-rw-r--r--source3/Makefile.in2
-rwxr-xr-xsource3/script/mkversion.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index d8cb4e7577c..4d927a9c234 100644
--- 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 a40154355bc..76477e780a7 100644
--- 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 d8ba8af008e..e6b375e6132 100755
--- 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