Remove useless include, simplify generated CFLAGS lines in Makefile.

(This used to be commit 3157ce9876aa69de54acf3f08e0ee2b16cfaff80)

diff --git a/source4/Makefile b/source4/Makefile
index f9a753eb6706f5f1be8baf8803cd14655b754879..1fddfefce3b3fcb444165d5c1f3734a022a445ad 100644 (file)
--- a/source4/Makefile
+++ b/source4/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/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 902e8f7f424e0589951510d8ee884f429aaec7a9..c5cc3d3e8cfaced247b890c3e52a2b5975eca3a3 100644 (file)
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/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;