summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-08-03 01:46:33 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:31:01 -0500
commit88632d832f0becc9aadfefc6d49a2c3593f58a2c (patch)
tree60550a6387305712897cf67e15d8763eb1a24960
parent1af653752073098af31191499c8f49c9a431e5dd (diff)
downloadsamba-88632d832f0becc9aadfefc6d49a2c3593f58a2c.tar.gz
samba-88632d832f0becc9aadfefc6d49a2c3593f58a2c.tar.bz2
samba-88632d832f0becc9aadfefc6d49a2c3593f58a2c.zip
r8972: More simplifications...
(This used to be commit d89caeb8004c5cfabc934c8efa899a6d1839d250)
-rw-r--r--source4/build/smb_build/makefile.pm44
-rw-r--r--source4/configure.in13
-rw-r--r--source4/lib/cmdline/config.m42
3 files changed, 19 insertions, 40 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 2f4a630dca..09b5677c21 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -3,6 +3,7 @@
### - create output for Makefile ###
### ###
### Copyright (C) Stefan (metze) Metzmacher 2004 ###
+### Copyright (C) Jelmer Vernooij 2005 ###
### Released under the GNU GPL ###
###########################################################
@@ -15,13 +16,13 @@ sub _prepare_path_vars()
my $output;
$output = << '__EOD__';
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-VPATH=@srcdir@
-srcdir=@srcdir@
-builddir=@builddir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+VPATH = @srcdir@
+srcdir = @srcdir@
+builddir = @builddir@
-BASEDIR= @prefix@
+BASEDIR = @prefix@
BINDIR = @bindir@
SBINDIR = @sbindir@
LIBDIR = @libdir@
@@ -107,13 +108,11 @@ sub _prepare_SUFFIXES()
__EOD__
}
-sub _prepare_IDL($)
+sub _prepare_IDL()
{
- my $ctx = shift;
-
return << '__EOD__';
idl_full: build/pidl/Parse/Pidl/IDL.pm
- CPP="$(CPP)" PERL="$(PERL)" script/build_idl.sh FULL @PIDL_ARGS@
+ @CPP="$(CPP)" PERL="$(PERL)" script/build_idl.sh FULL @PIDL_ARGS@
idl: build/pidl/Parse/Pidl/IDL.pm
@CPP="$(CPP)" PERL="$(PERL)" script/build_idl.sh PARTIAL @PIDL_ARGS@
@@ -442,11 +441,10 @@ sub _prepare_objlist_rule($)
{
my $ctx = shift;
my $tmpdepend = array2oneperline($ctx->{DEPEND_LIST});
- my $output;
return "" unless $ctx->{TARGET};
- $output = "$ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST = $tmpdepend\n";
+ my $output = "$ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST = $tmpdepend\n";
$output .= "$ctx->{TARGET}: ";
$output .= "\$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJS)\n";
$output .= "\t\@touch $ctx->{TARGET}\n";
@@ -516,16 +514,12 @@ __EOD__
sub _prepare_binary_rule($)
{
my $ctx = shift;
- my $tmpdepend;
- my $tmplink;
- my $tmpflag;
- my $output;
- $tmpdepend = array2oneperline($ctx->{DEPEND_LIST});
- $tmplink = array2oneperline($ctx->{LINK_LIST});
- $tmpflag = array2oneperline($ctx->{LINK_FLAGS});
+ my $tmpdepend = array2oneperline($ctx->{DEPEND_LIST});
+ my $tmplink = array2oneperline($ctx->{LINK_LIST});
+ my $tmpflag = array2oneperline($ctx->{LINK_FLAGS});
- $output = << "__EOD__";
+ my $output = << "__EOD__";
#
BINARY_$ctx->{NAME}_DEPEND_LIST =$tmpdepend
BINARY_$ctx->{NAME}_LINK_LIST =$tmplink
@@ -692,7 +686,7 @@ install: showlayout installbin installdat installswat
# DESTDIR is used here to prevent packagers wasting their time
# duplicating the Makefile. Remove it and you will have the privilege
-# of package each samba release for multiple versions of multiple
+# of packaging each samba release for multiple versions of multiple
# distributions and operating systems, or at least supplying patches
# to all the packaging files required for this, prior to committing
# the removal of DESTDIR. Do not remove it even though you think it
@@ -724,7 +718,6 @@ uninstallman:
@$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(MANDIR) $(MANPAGES)
# Swig extensions
-
swig: scripting/swig/_tdb.so scripting/swig/_dcerpc.so
scripting/swig/tdb_wrap.c: scripting/swig/tdb.i
@@ -776,8 +769,7 @@ sub _prepare_rule_lists($)
($output .= _prepare_custom_rule($key) ) if $key->{TYPE} eq "TARGET";
}
- my $idl_ctx;
- $output .= _prepare_IDL($idl_ctx);
+ $output .= _prepare_IDL();
$output .= _prepare_proto_rules();
$output .= _prepare_install_rules($depend);
@@ -807,8 +799,8 @@ sub _prepare_makefile_in($)
$output .= _prepare_default_rule();
$output .= _prepare_SUFFIXES();
$output .= _prepare_dummy_MAKEDIR();
- $output .= _prepare_std_CC_rule("c","o",'@PICFLAG@',"Compiling","Rule for std objectfiles");
- $output .= _prepare_std_CC_rule("h","h.gch",'@PICFLAG@',"Precompiling","Rule for precompiled headerfiles");
+ $output .= _prepare_std_CC_rule("c","o",$config{PICFLAG},"Compiling","Rule for std objectfiles");
+ $output .= _prepare_std_CC_rule("h","h.gch",$config{PICFLAG},"Precompiling","Rule for precompiled headerfiles");
$output .= _prepare_lex_rule();
$output .= _prepare_yacc_rule();
$output .= _prepare_et_rule();
diff --git a/source4/configure.in b/source4/configure.in
index dd93d8af2a..e4bcc64fe9 100644
--- a/source4/configure.in
+++ b/source4/configure.in
@@ -40,19 +40,6 @@ sinclude(web_server/config.m4)
sinclude(auth/config.m4)
sinclude(kdc/config.m4)
-ALLLIBS_LIBS="$LIBS"
-ALLLIBS_CFLAGS="$CFLAGS"
-ALLLIBS_CPPFLAGS="$CPPFLAGS"
-ALLLIBS_LDFLAGS="$LDFLAGS"
-
-SMB_EXT_LIB_ENABLE(ALLLIBS,YES)
-
-SMB_EXT_LIB(ALLLIBS,
- [${ALLLIBS_LIBS}],
- [${ALLLIBS_CFLAGS}],
- [${ALLLIBS_CPPFLAGS}],
- [${ALLLIBS_LDFLAGS}])
-
AC_DEFINE_UNQUOTED(STRING_STATIC_MODULES, "$string_static_modules", [String list of builtin modules])
#################################################
diff --git a/source4/lib/cmdline/config.m4 b/source4/lib/cmdline/config.m4
index 4f6606b8db..e43f7cf390 100644
--- a/source4/lib/cmdline/config.m4
+++ b/source4/lib/cmdline/config.m4
@@ -76,7 +76,7 @@ SMB_EXT_LIB(READLINE, [${TMP_LIBCMDLINE_LIBS}])
SMB_SUBSYSTEM(LIBCMDLINE,[],
[${TMP_LIBCMDLINE_OBJS}],
- [LIBPOPT EXT_LIB_READLINE EXT_LIB_ALLLIBS LIBCMDLINE_CREDENTIALS])
+ [LIBPOPT EXT_LIB_READLINE LIBCMDLINE_CREDENTIALS])
AC_CACHE_CHECK([whether getpass should be replaced],samba_cv_REPLACE_GETPASS,[
SAVE_CPPFLAGS="$CPPFLAGS"