diff options
author | Andrew Bartlett <abartlet@samba.org> | 2011-05-09 10:59:15 +0200 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-09 11:21:09 +0200 |
commit | 7e8f086798c36f64581ed7444df535e85fa0b5af (patch) | |
tree | 511f0050a8c0e072e13c2b6c2de7bd641f34ca6c /source3/Makefile.in | |
parent | 8aab926c2804230b633e0eb29655f4e32226aa4f (diff) | |
download | samba-7e8f086798c36f64581ed7444df535e85fa0b5af.tar.gz samba-7e8f086798c36f64581ed7444df535e85fa0b5af.tar.bz2 samba-7e8f086798c36f64581ed7444df535e85fa0b5af.zip |
s3-build: Move generated config.h and config.h.in to include/autoconf
This ensures that these are not found by the waf build, which causes
issues when the wrong config.h is used by the recursive smbtorture build
Andrew Bartlett
Diffstat (limited to 'source3/Makefile.in')
-rw-r--r-- | source3/Makefile.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 456d4f5571..55a32016d1 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -1766,16 +1766,16 @@ lib/version.o: lib/version.c include/version.h echo "$(COMPILE_CC_PATH)" 1>&2;\ $(COMPILE_CC_PATH) >/dev/null 2>&1 -smbd/build_options.o: smbd/build_options.c Makefile include/config.h include/build_env.h include/proto.h +smbd/build_options.o: smbd/build_options.c Makefile include/autoconf/config.h include/build_env.h include/proto.h @echo Compiling $*.c @$(COMPILE_CC_PATH) && exit 0;\ echo "The following command failed:" 1>&2;\ echo "$(COMPILE_CC_PATH)" 1>&2;\ $(COMPILE_CC_PATH) >/dev/null 2>&1 -smbd/build_options.c: include/config.h.in script/mkbuildoptions.awk +smbd/build_options.c: include/autoconf/config.h.in script/mkbuildoptions.awk @echo Generating $@ - @dir=smbd $(MAKEDIR) && $(AWK) -f $(srcdir)/script/mkbuildoptions.awk > $(builddir)/smbd/build_options.c < $(srcdir)/include/config.h.in + @dir=smbd $(MAKEDIR) && $(AWK) -f $(srcdir)/script/mkbuildoptions.awk > $(builddir)/smbd/build_options.c < $(srcdir)/include/autoconf/config.h.in bin/.dummy: @if (: >> $@ || : > $@) >/dev/null 2>&1; then :; else \ @@ -3362,12 +3362,12 @@ realclean:: clean distclean:: realclean -rm -f smbadduser - -rm -f include/config.h Makefile + -rm -f include/autoconf/config.h Makefile -rm -f config.status config.cache so_locations -rm -rf .deps TAGS realdistclean:: distclean - -rm -f include/config.h.in + -rm -f include/autoconf/config.h.in -rm -f include/version.h -rm -f configure |