From 584a51b2ca891c5546c7e9ee8f039bfeb4d6a319 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 17 May 2012 16:43:48 +1000 Subject: 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 --- .gitignore | 2 +- source3/Makefile.in | 2 +- source3/script/mkversion.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d8cb4e7577..4d927a9c23 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 a40154355b..76477e780a 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 d8ba8af008..e6b375e613 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 -- cgit