[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1172-g18c683d

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  18c683d7e804e76ac37d4069429b5ba1a9d9ae38 (commit)
       via  3157ce9876aa69de54acf3f08e0ee2b16cfaff80 (commit)
      from  ce2b7cec10af5bb222715e2e3c0ff139f659ed6e (commit)

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


- Log -----------------------------------------------------------------
commit 18c683d7e804e76ac37d4069429b5ba1a9d9ae38
Merge: 3157ce9876aa69de54acf3f08e0ee2b16cfaff80 ce2b7cec10af5bb222715e2e3c0ff139f659ed6e
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Feb 29 15:34:45 2008 +0100

    Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test

commit 3157ce9876aa69de54acf3f08e0ee2b16cfaff80
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Feb 29 15:32:33 2008 +0100

    Remove useless include, simplify generated CFLAGS lines in Makefile.

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

Summary of changes:
 source/Makefile                    |    1 -
 source/build/smb_build/makefile.pm |    8 +-------
 2 files changed, 1 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile b/source/Makefile
index f9a753e..1fddfef 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -23,7 +23,6 @@ default: all
 
 include rules.mk
 include data.mk
-include extra_cflags.txt
 
 DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \
 		  $(srcdir)/version.h
diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 902e8f7..c5cc3d3 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -442,13 +442,7 @@ sub CFlags($$)
 	
 	my $cflags = join(' ', @cflags);
 
-	foreach (@{$key->{OBJ_LIST}}) {
-		my $ofile = $_;
-		my $dfile = $_;
-		$dfile =~ s/\.o$/.d/;
-		$dfile =~ s/\.ho$/.d/;
-		$self->output("$ofile $dfile: CFLAGS+= $cflags\n");
-	}
+	$self->output("\$(patsubst %.ho,%.d,\$(key->{NAME}_OBJ_FILES:.o=.d)) \$($key->{NAME}_OBJ_FILES): CFLAGS+= $cflags\n");
 }
 
 1;


-- 
Samba Shared Repository