summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-29 15:32:33 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-29 15:32:33 +0100
commit232d51e666a9a9dd65579d9c7b5873bafa9f669d (patch)
tree9c48eee89956c4ce9d29560a1aa4fa466cb52b61
parent07f6f9b2115b3df03ac11a0db9bf1c4ff5d513cc (diff)
downloadsamba-232d51e666a9a9dd65579d9c7b5873bafa9f669d.tar.gz
samba-232d51e666a9a9dd65579d9c7b5873bafa9f669d.tar.bz2
samba-232d51e666a9a9dd65579d9c7b5873bafa9f669d.zip
Remove useless include, simplify generated CFLAGS lines in Makefile.
(This used to be commit 3157ce9876aa69de54acf3f08e0ee2b16cfaff80)
-rw-r--r--source4/Makefile1
-rw-r--r--source4/build/smb_build/makefile.pm8
2 files changed, 1 insertions, 8 deletions
diff --git a/source4/Makefile b/source4/Makefile
index f9a753eb67..1fddfefce3 100644
--- 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 902e8f7f42..c5cc3d3e8c 100644
--- 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;