diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 16:33:23 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 16:33:23 +0100 |
| commit | a44e0b245545597e4752e712446e6d8a3585648c (patch) | |
| tree | 10c9e6c449080ed6765fe0b618bc5e146509063c | |
| parent | 80cbff3d011ad9264462812f57991ed0393b385e (diff) | |
| download | samba-a44e0b245545597e4752e712446e6d8a3585648c.tar.gz samba-a44e0b245545597e4752e712446e6d8a3585648c.tar.bz2 samba-a44e0b245545597e4752e712446e6d8a3585648c.zip | |
Simplify some more smb_build code.
(This used to be commit 95b06bd8f2a91c9f3f9e9f05f7e2803d6b4100c7)
| -rw-r--r-- | source4/build/smb_build/input.pm | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index f970d5b677..f175b4c8c9 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -5,13 +5,10 @@ # Copyright (C) Jelmer Vernooij 2004 # Released under the GNU GPL -use smb_build::config; use strict; package smb_build::input; use File::Basename; -my $srcdir = $config::config{srcdir}; - sub strtrim($) { $_ = shift; @@ -60,10 +57,7 @@ sub check_subsystem($$$) my ($INPUT, $subsys, $default_ot) = @_; return if ($subsys->{ENABLE} ne "YES"); - unless(defined($subsys->{OUTPUT_TYPE})) { - $subsys->{OUTPUT_TYPE} = $default_ot; - } - + unless (defined($subsys->{OUTPUT_TYPE})) { $subsys->{OUTPUT_TYPE} = $default_ot; } unless (defined($subsys->{INIT_FUNCTION_TYPE})) { $subsys->{INIT_FUNCTION_TYPE} = "NTSTATUS (*) (void)"; } unless (defined($subsys->{INIT_FUNCTION_SENTINEL})) { $subsys->{INIT_FUNCTION_SENTINEL} = "NULL"; } } @@ -159,8 +153,8 @@ sub check_python($$$) $python->{OBJ_FILES} = ["$dirname$basename\_wrap.o"]; $python->{LIBRARY_REALNAME} = "_$basename.\$(SHLIBEXT)"; $python->{PYTHON_FILES} = ["$dirname$basename.py"]; - push (@{$python->{CFLAGS}}, $config::config{CFLAG_NO_UNUSED_MACROS}); - push (@{$python->{CFLAGS}}, $config::config{CFLAG_NO_CAST_QUAL}); + push (@{$python->{CFLAGS}}, "\$(CFLAG_NO_UNUSED_MACROS)"); + push (@{$python->{CFLAGS}}, "\$(CFLAG_NO_CAST_QUAL)"); $python->{INIT_FUNCTION} = "{ (char *)\"_$basename\", init_$basename }"; } else { my $basename = $python->{NAME}; |