From 1824d52ff2c5492b091502c9fcf70aa073b51b37 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 14 Nov 2004 23:10:04 +0000 Subject: r3740: Convert more files to .mk, fix the build (This used to be commit a7c3c8cb6256acf672996fc6bf6128865a9ba0a9) --- source4/build/smb_build/input.pm | 2 +- source4/build/smb_build/main.pm | 4 +++- source4/build/smb_build/smb_build_h.pm | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'source4/build') diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index f50f8baaaf..ddeddc6ec1 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -11,7 +11,7 @@ use strict; package input; my $subsystem_output_type = "OBJLIST"; -our $srcdir = "."; +my $srcdir = "."; sub strtrim($) { diff --git a/source4/build/smb_build/main.pm b/source4/build/smb_build/main.pm index 928921f8fd..4329038221 100644 --- a/source4/build/smb_build/main.pm +++ b/source4/build/smb_build/main.pm @@ -51,7 +51,9 @@ sub smb_build_main($) "torture/config.mk", "librpc/config.mk", "client/config.mk", - "libcli/libsmb.mk"); + "libcli/libsmb.mk", + "libcli/config.mk" + ); $| = 1; diff --git a/source4/build/smb_build/smb_build_h.pm b/source4/build/smb_build/smb_build_h.pm index f074f92199..6d67eedf60 100644 --- a/source4/build/smb_build/smb_build_h.pm +++ b/source4/build/smb_build/smb_build_h.pm @@ -103,13 +103,13 @@ sub create_smb_build_h($) $output .= _prepare_smb_build_h($CTX); - open(SMB_BUILD_H,"> $input::srcdir/include/smb_build.h") || die ("Can't open include/smb_build.h\n"); + open(SMB_BUILD_H,"> include/smb_build.h") || die ("Can't open include/smb_build.h\n"); print SMB_BUILD_H $output; close(SMB_BUILD_H); - print "config.smb_build.pl: creating $input::srcdir/include/smb_build.h\n"; + print "config.smb_build.pl: creating include/smb_build.h\n"; return; } 1; -- cgit