diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 17:55:50 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 17:55:50 +0200 |
| commit | 353afc8d943f6ecfad83af830919afdcc5a853fc (patch) | |
| tree | 1a6b344176cc0713550f981fcaf4cbf005250d52 /source4 | |
| parent | 9207a22a0e624b60f148fe7ac261b130ba6c285d (diff) | |
| download | samba-353afc8d943f6ecfad83af830919afdcc5a853fc.tar.gz samba-353afc8d943f6ecfad83af830919afdcc5a853fc.tar.bz2 samba-353afc8d943f6ecfad83af830919afdcc5a853fc.zip | |
Move writing of data.mk file to m4 macro.
(This used to be commit 7fee112d2b86b423c397118f0333065825ea3518)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/m4/public.m4 | 31 | ||||
| -rw-r--r-- | source4/build/smb_build/main.pl | 4 | ||||
| -rw-r--r-- | source4/configure.ac | 27 |
3 files changed, 35 insertions, 27 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index 7a9a76d60f..300c64f854 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -190,3 +190,34 @@ $SMB_INFO_ENABLES 1; CEOF ]) + +dnl SMB_BUILD_RUN(OUTPUT_FILE) +AC_DEFUN([SMB_BUILD_RUN], +[ +AC_OUTPUT_COMMANDS( +[ +test "x$ac_abs_srcdir" != "x$ac_abs_builddir" && ( + cd $builddir; + # NOTE: We *must* use -R so we don't follow symlinks (at least on BSD + # systems). + test -d heimdal || cp -R $srcdir/heimdal $builddir/ + test -d heimdal_build || cp -R $srcdir/heimdal_build $builddir/ + test -d build || builddir="$builddir" \ + srcdir="$srcdir" \ + $PERL ${srcdir}/script/buildtree.pl + ) + +$PERL -I${builddir} -I${builddir}/build \ + -I${srcdir} -I${srcdir}/build \ + ${srcdir}/build/smb_build/main.pl $1 || exit $? +], +[ +srcdir="$srcdir" +builddir="$builddir" +PERL="$PERL" + +export PERL +export srcdir +export builddir +]) +]) diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index d31bea73f3..07d0d5a90b 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -13,6 +13,8 @@ use smb_build::summary; use smb_build::config; use strict; +my $output_file = shift @ARGV; + my $INPUT = {}; my $mkfile = smb_build::config_mk::run_config_mk($INPUT, $config::config{srcdir}, $config::config{builddir}, "main.mk"); @@ -84,7 +86,7 @@ foreach my $key (values %$OUTPUT) { $mkenv->InitFunctions($key) if defined($key->{INIT_FUNCTIONS}); } -$mkenv->write("data.mk"); +$mkenv->write($output_file); summary::show($OUTPUT, \%config::config); diff --git a/source4/configure.ac b/source4/configure.ac index 8671c1a352..73d3ffd4d9 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -170,32 +170,7 @@ $SMB_INFO_SUBSYSTEMS $SMB_INFO_LIBRARIES CEOF -AC_OUTPUT_COMMANDS( -[ -test "x$ac_abs_srcdir" != "x$ac_abs_builddir" && ( - cd $builddir; - # NOTE: We *must* use -R so we don't follow symlinks (at least on BSD - # systems). - test -d heimdal || cp -R $srcdir/heimdal $builddir/ - test -d heimdal_build || cp -R $srcdir/heimdal_build $builddir/ - test -d build || builddir="$builddir" \ - srcdir="$srcdir" \ - $PERL ${srcdir}/script/buildtree.pl - ) - -$PERL -I${builddir} -I${builddir}/build \ - -I${srcdir} -I${srcdir}/build \ - ${srcdir}/build/smb_build/main.pl || exit $? -], -[ -srcdir="$srcdir" -builddir="$builddir" -PERL="$PERL" - -export PERL -export srcdir -export builddir -]) +SMB_BUILD_RUN(data.mk) AC_OUTPUT cmp include/config_tmp.h include/config.h >/dev/null 2>&1 |