svn commit: samba r12218 - in branches/SAMBA_4_0/source:
build/smb_build scripting
jelmer at samba.org
jelmer at samba.org
Tue Dec 13 21:00:53 GMT 2005
Author: jelmer
Date: 2005-12-13 21:00:52 +0000 (Tue, 13 Dec 2005)
New Revision: 12218
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12218
Log:
Use common functions for generating lists
Modified:
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
branches/SAMBA_4_0/source/scripting/config.mk
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-12-13 19:45:24 UTC (rev 12217)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-12-13 21:00:52 UTC (rev 12218)
@@ -216,24 +216,24 @@
return $output;
}
-sub _prepare_obj_list($$$)
+sub _prepare_list($$$)
{
- my ($self,$var,$ctx) = @_;
+ my ($self,$ctx,$var) = @_;
- my $tmplist = array2oneperline($ctx->{OBJ_LIST});
+ my $tmplist = array2oneperline($ctx->{$var});
return if ($tmplist eq "");
- $self->output("$var\_$ctx->{NAME}_OBJS =$tmplist\n");
+ $self->output("$ctx->{TYPE}\_$ctx->{NAME}_$var =$tmplist\n");
}
-sub _prepare_cflags($$$)
+sub _prepare_obj_list($$$)
{
- my ($self, $var,$ctx) = @_;
+ my ($self,$var,$ctx) = @_;
- my $tmplist = array2oneperline($ctx->{CFLAGS});
+ my $tmplist = array2oneperline($ctx->{OBJ_LIST});
return if ($tmplist eq "");
- $self->output("$var\_$ctx->{NAME}_CFLAGS =$tmplist\n");
+ $self->output("$var\_$ctx->{NAME}_OBJS =$tmplist\n");
}
sub SharedLibrary($$)
@@ -243,23 +243,19 @@
push (@{$self->{shared_libs}}, "bin/$ctx->{LIBRARY_NAME}");
$self->_prepare_obj_list($ctx->{TYPE}, $ctx);
- $self->_prepare_cflags($ctx->{TYPE}, $ctx);
+ $self->_prepare_list($ctx, "CFLAGS");
+ $self->_prepare_list($ctx, "DEPEND_LIST");
+ $self->_prepare_list($ctx, "LINK_LIST");
+ $self->_prepare_list($ctx, "LINK_FLAGS");
- my $tmpdepend = array2oneperline($ctx->{DEPEND_LIST});
- my $tmpshlink = array2oneperline($ctx->{LINK_LIST});
- my $tmpshflag = array2oneperline($ctx->{LINK_FLAGS});
-
$self->output(<< "__EOD__"
-LIBRARY_$ctx->{NAME}_DEPEND_LIST =$tmpdepend
-LIBRARY_$ctx->{NAME}_SHARED_LINK_LIST =$tmpshlink
-LIBRARY_$ctx->{NAME}_SHARED_LINK_FLAGS =$tmpshflag
#
$ctx->{TARGET}: \$(LIBRARY_$ctx->{NAME}_DEPEND_LIST) \$(LIBRARY_$ctx->{NAME}_OBJS) bin/.dummy
\@echo Linking \$\@
\@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \\
- \$(LIBRARY_$ctx->{NAME}_SHARED_LINK_FLAGS) \\
- \$(LIBRARY_$ctx->{NAME}_SHARED_LINK_LIST)
+ \$(LIBRARY_$ctx->{NAME}_LINK_FLAGS) \\
+ \$(LIBRARY_$ctx->{NAME}_LINK_LIST)
__EOD__
);
@@ -287,11 +283,9 @@
return unless $ctx->{TARGET};
- my $tmpdepend = array2oneperline($ctx->{DEPEND_LIST});
-
$self->_prepare_obj_list($ctx->{TYPE}, $ctx);
- $self->_prepare_cflags($ctx->{TYPE}, $ctx);
- $self->output("$ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST = $tmpdepend\n");
+ $self->_prepare_list($ctx, "CFLAGS");
+ $self->_prepare_list($ctx, "DEPEND_LIST");
$self->output("$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_OBJS)\n");
@@ -303,13 +297,12 @@
sub ObjList($$)
{
my ($self,$ctx) = @_;
- my $tmpdepend = array2oneperline($ctx->{DEPEND_LIST});
return unless $ctx->{TARGET};
$self->_prepare_obj_list($ctx->{TYPE}, $ctx);
- $self->_prepare_cflags($ctx->{TYPE}, $ctx);
- $self->output("$ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST = $tmpdepend\n");
+ $self->_prepare_list($ctx, "CFLAGS");
+ $self->_prepare_list($ctx, "DEPEND_LIST");
$self->output("$ctx->{TARGET}: ");
$self->output("\$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJS)\n");
$self->output("\t\@touch $ctx->{TARGET}\n");
@@ -322,21 +315,18 @@
push (@{$self->{static_libs}}, $ctx->{OUTPUT});
$self->_prepare_obj_list($ctx->{TYPE}, $ctx);
- $self->_prepare_cflags($ctx->{TYPE}, $ctx);
+ $self->_prepare_list($ctx, "CFLAGS");
- my $tmpdepend = array2oneperline($ctx->{DEPEND_LIST});
- my $tmpstlink = array2oneperline($ctx->{LINK_LIST});
- my $tmpstflag = array2oneperline($ctx->{LINK_FLAGS});
+ $self->_prepare_list($ctx, "DEPEND_LIST");
+ $self->_prepare_list($ctx, "LINK_LIST");
+ $self->_prepare_list($ctx, "LINK_FLAGS");
$self->output(<< "__EOD__"
-LIBRARY_$ctx->{NAME}_DEPEND_LIST =$tmpdepend
#
-LIBRARY_$ctx->{NAME}_STATIC_LINK_LIST =$tmpstlink
-#
$ctx->{TARGET}: \$(LIBRARY_$ctx->{NAME}_DEPEND_LIST) \$(LIBRARY_$ctx->{NAME}_OBJS) bin/.dummy
\@echo Linking \$@
\@\$(STLD) \$(STLD_FLAGS) \$@ \\
- \$(LIBRARY_$ctx->{NAME}_STATIC_LINK_LIST)
+ \$(LIBRARY_$ctx->{NAME}_LINK_LIST)
library_$ctx->{NAME}: basics $ctx->{TARGET}
@@ -365,21 +355,17 @@
}
$self->_prepare_obj_list($ctx->{TYPE}, $ctx);
- $self->_prepare_cflags($ctx->{TYPE}, $ctx);
- my $tmpdepend = array2oneperline($ctx->{DEPEND_LIST});
- my $tmplink = array2oneperline($ctx->{LINK_LIST});
- my $tmpflag = array2oneperline($ctx->{LINK_FLAGS});
+ $self->_prepare_list($ctx, "CFLAGS");
+ $self->_prepare_list($ctx, "DEPEND_LIST");
+ $self->_prepare_list($ctx, "LINK_LIST");
+ $self->_prepare_list($ctx, "LINK_FLAGS");
$self->output(<< "__EOD__"
#
-BINARY_$ctx->{NAME}_DEPEND_LIST =$tmpdepend
-BINARY_$ctx->{NAME}_LINK_LIST =$tmplink
-BINARY_$ctx->{NAME}_LINK_FLAGS =$tmpflag
#
bin/$ctx->{BINARY}: bin/.dummy \$(BINARY_$ctx->{NAME}_DEPEND_LIST) \$(BINARY_$ctx->{NAME}_OBJS)
\@echo Linking \$\@
\@\$(CC) \$(LDFLAGS) -o \$\@ \\
- \$\(BINARY_$ctx->{NAME}_LINK_FLAGS) \\
\$\(BINARY_$ctx->{NAME}_LINK_LIST) \\
\$\(BINARY_$ctx->{NAME}_LINK_FLAGS)
binary_$ctx->{BINARY}: basics bin/$ctx->{BINARY}
Modified: branches/SAMBA_4_0/source/scripting/config.mk
===================================================================
--- branches/SAMBA_4_0/source/scripting/config.mk 2005-12-13 19:45:24 UTC (rev 12217)
+++ branches/SAMBA_4_0/source/scripting/config.mk 2005-12-13 21:00:52 UTC (rev 12218)
@@ -22,7 +22,7 @@
scripting/swig/_tdb.so: scripting/swig/tdb_wrap.o $(LIBRARY_swig_tdb_DEPEND_LIST)
$(SHLD) $(SHLD_FLAGS) -o scripting/swig/_tdb.so scripting/swig/tdb_wrap.o \
- $(LIBRARY_swig_tdb_SHARED_LINK_LIST) $(LIBRARY_swig_tdb_SHARED_LINK_FLAGS)
+ $(LIBRARY_swig_tdb_LINK_LIST) $(LIBRARY_swig_tdb_LINK_FLAGS)
SWIG_INCLUDES = librpc/gen_ndr/samr.i librpc/gen_ndr/lsa.i librpc/gen_ndr/spoolss.i
@@ -30,7 +30,7 @@
swig -python scripting/swig/dcerpc.i
scripting/swig/_dcerpc.so: scripting/swig/dcerpc_wrap.o $(LIBRARY_swig_dcerpc_DEPEND_LIST)
- $(SHLD) $(SHLD_FLAGS) -o scripting/swig/_dcerpc.so scripting/swig/dcerpc_wrap.o $(LIBRARY_swig_dcerpc_SHARED_LINK_LIST) $(LIBRARY_swig_dcerpc_SHARED_LINK_FLAGS)
+ $(SHLD) $(SHLD_FLAGS) -o scripting/swig/_dcerpc.so scripting/swig/dcerpc_wrap.o $(LIBRARY_swig_dcerpc_LINK_LIST) $(LIBRARY_swig_dcerpc_LINK_FLAGS)
swig_clean:
-rm -f scripting/swig/_tdb.so scripting/swig/tdb.pyc scripting/swig/tdb.py scripting/swig/tdb_wrap.c scripting/swig/tdb_wrap.o
More information about the samba-cvs
mailing list