[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-883-gef14e1a

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  ef14e1ab3267263d65c4c41cd3c0dab3680f4104 (commit)
       via  78fb91ee672c15c7575e8f9db84c0524318bf8bd (commit)
      from  95b06bd8f2a91c9f3f9e9f05f7e2803d6b4100c7 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit ef14e1ab3267263d65c4c41cd3c0dab3680f4104
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Feb 18 17:08:54 2008 +0100

    Factor out common code that generates object lists.

commit 78fb91ee672c15c7575e8f9db84c0524318bf8bd
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Feb 18 16:57:17 2008 +0100

    Remove mergedobj files during clean.

-----------------------------------------------------------------------

Summary of changes:
 source/build/smb_build/main.pl     |    7 ++-----
 source/build/smb_build/makefile.pm |   12 ------------
 source/build/smb_build/output.pm   |    2 +-
 source/rules.mk                    |    2 +-
 4 files changed, 4 insertions(+), 19 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/build/smb_build/main.pl b/source/build/smb_build/main.pl
index 4c09e32..d4d18a5 100644
--- a/source/build/smb_build/main.pl
+++ b/source/build/smb_build/main.pl
@@ -48,14 +48,11 @@ $config::config{LIBRARY_OUTPUT_TYPE} = $library_output_type;
 $config::config{MODULE_OUTPUT_TYPE} = $module_output_type;
 my $mkenv = new smb_build::makefile(\%config::config, $mkfile);
 
+my $shared_libs_used = 0;
 foreach my $key (values %$OUTPUT) {
-	next unless defined $key->{OUTPUT_TYPE};
-
-	$mkenv->Integrated($key) if grep(/INTEGRATED/, @{$key->{OUTPUT_TYPE}});
+	$mkenv->_prepare_list($key, "OBJ_LIST");
 }
 
-my $shared_libs_used = 0;
-
 foreach my $key (values %$OUTPUT) {
 	next unless defined $key->{OUTPUT_TYPE};
 
diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index dc9e1e9..b06279e 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -112,13 +112,6 @@ sub _prepare_list($$$)
 	$self->output("$ctx->{NAME}_$var =$tmplist\n");
 }
 
-sub Integrated($$)
-{
-	my ($self,$ctx) = @_;
-
-	$self->_prepare_list($ctx, "OBJ_LIST");
-}
-
 sub SharedModulePrimitives($$)
 {
 	my ($self,$ctx) = @_;
@@ -163,7 +156,6 @@ sub SharedModule($$)
 	}
 
 	$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
-	$self->_prepare_list($ctx, "OBJ_LIST");
 	$self->_prepare_list($ctx, "FULL_OBJ_LIST");
 	$self->_prepare_list($ctx, "DEPEND_LIST");
 	$self->_prepare_list($ctx, "LINK_FLAGS");
@@ -221,7 +213,6 @@ sub SharedLibraryPrimitives($$)
 
 	if (not grep(/STATIC_LIBRARY/, @{$ctx->{OUTPUT_TYPE}})) {
 		$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
-		$self->_prepare_list($ctx, "OBJ_LIST");
 		$self->_prepare_list($ctx, "FULL_OBJ_LIST");
 	}
 }
@@ -269,7 +260,6 @@ sub MergedObj($$)
 	my ($self, $ctx) = @_;
 
 	$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
-	$self->_prepare_list($ctx, "OBJ_LIST");
 	$self->_prepare_list($ctx, "FULL_OBJ_LIST");
 	push(@{$self->{all_objs}}, "\$($ctx->{NAME}_FULL_OBJ_LIST)");
 	$self->output(<< "__EOD__"
@@ -292,7 +282,6 @@ sub StaticLibrary($$)
 	push (@{$self->{static_libs}}, $ctx->{RESULT_STATIC_LIBRARY}) if ($ctx->{TYPE} eq "LIBRARY");
 
 	$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
-	$self->_prepare_list($ctx, "OBJ_LIST");
 	$self->_prepare_list($ctx, "FULL_OBJ_LIST");
 
 	push(@{$self->{all_objs}}, "\$($ctx->{NAME}_FULL_OBJ_LIST)");
@@ -335,7 +324,6 @@ sub Binary($$)
 
 	$self->output("binaries:: $ctx->{TARGET_BINARY}\n");
 
-	$self->_prepare_list($ctx, "OBJ_LIST");
 	$self->_prepare_list($ctx, "FULL_OBJ_LIST");
 	$self->_prepare_list($ctx, "DEPEND_LIST");
 	$self->_prepare_list($ctx, "LINK_FLAGS");
diff --git a/source/build/smb_build/output.pm b/source/build/smb_build/output.pm
index 67b905e..33493ec 100644
--- a/source/build/smb_build/output.pm
+++ b/source/build/smb_build/output.pm
@@ -201,7 +201,7 @@ sub create_output($$)
 			push(@{$part->{LINK_FLAGS}}, "\$($elem->{NAME}_OUTPUT)") if defined($elem->{OUTPUT});
 			push(@{$part->{LINK_FLAGS}}, @{$elem->{LIBS}}) if defined($elem->{LIBS});
 			push(@{$part->{LINK_FLAGS}},@{$elem->{LDFLAGS}}) if defined($elem->{LDFLAGS});
-		    	push(@{$part->{DEPEND_LIST}}, $elem->{TARGET}) if defined($elem->{TARGET});
+			push(@{$part->{DEPEND_LIST}}, $elem->{TARGET}) if defined($elem->{TARGET});
 		}
 	}
 
diff --git a/source/rules.mk b/source/rules.mk
index 4e7841f..b6a54fa 100644
--- a/source/rules.mk
+++ b/source/rules.mk
@@ -66,7 +66,7 @@ clean:: clean_pch
 	@-rm -f $(BIN_PROGS) $(SBIN_PROGS) $(BINARIES) $(TORTURE_PROGS)
 	@echo Removing libraries
 	@-rm -f $(STATIC_LIBRARIES) $(SHARED_LIBRARIES)
-	@-rm -f bin/static/*.a bin/shared/*.$(SHLIBEXT)
+	@-rm -f bin/static/*.a bin/shared/*.$(SHLIBEXT) bin/mergedobj/*.o
 	@echo Removing modules
 	@-rm -f bin/modules/*/*.$(SHLIBEXT)
 	@-rm -f bin/*_init_module.c


-- 
Samba Shared Repository