diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-09-05 20:56:28 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:36:32 -0500 |
| commit | e3a1ee4788788307d9bffaca9ee63f2bf4614967 (patch) | |
| tree | 12d9a9f967e1f3a3457ce030da628e142a0b2e51 /source4 | |
| parent | 46ca543e198d96598521ac809db9c21ff467e588 (diff) | |
| download | samba-e3a1ee4788788307d9bffaca9ee63f2bf4614967.tar.gz samba-e3a1ee4788788307d9bffaca9ee63f2bf4614967.tar.bz2 samba-e3a1ee4788788307d9bffaca9ee63f2bf4614967.zip | |
r10043: Only recompile subsystems that actually need recompilation
(This used to be commit de9830979788528754175b17fe45477e6ce9ce9e)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 2 | ||||
| -rw-r--r-- | source4/build/smb_build/output.pm | 6 | ||||
| -rw-r--r-- | source4/lib/registry/config.mk | 1 |
3 files changed, 3 insertions, 6 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index f6619416ab..f9e481a77a 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -365,7 +365,7 @@ sub _prepare_mergedobj_rule($) my $output = "$ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST = $tmpdepend\n"; - $output .= "$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJS)\n"; + $output .= "$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_OBJS)\n"; $output .= "\t\@echo \"Pre-Linking $ctx->{TYPE} $ctx->{NAME}\"\n"; $output .= "\t@\$(LD) -r \$($ctx->{TYPE}_$ctx->{NAME}_OBJS) -o $ctx->{TARGET}\n"; diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index b126440dd4..68a0060b6c 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -120,11 +120,6 @@ sub create_output($) foreach $part (values %{$depend}) { next if not defined($part->{OUTPUT_TYPE}); - foreach (@{$part->{DEPENDENCIES}}) { - my $elem = $$_; - push(@{$part->{DEPEND_LIST}}, $elem->{TARGET}) if defined($elem->{TARGET}); - } - # Always import the CFLAGS and CPPFLAGS of the unique dependencies foreach my $elem (values %{$part->{UNIQUE_DEPENDENCIES}}) { next if $elem == $part; @@ -134,6 +129,7 @@ sub create_output($) push(@{$part->{LINK_LIST}}, $elem->{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->{SUBSYSTEM_INIT_FUNCTIONS}}, $elem->{INIT_FUNCTION}) if $part->{OUTPUT_TYPE} eq "BINARY" and diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index 43149f88aa..d0939c720b 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -16,6 +16,7 @@ REQUIRED_SUBSYSTEMS = TDR NOPROTO = YES INIT_OBJ_FILES = lib/registry/tdr_regf.o +lib/registry/reg_backend_nt4.c: lib/registry/tdr_regf.c lib/registry/tdr_regf.c: lib/registry/regf.idl @./pidl/pidl --header --outputdir=lib/registry --parse --tdr-header --tdr-parser -- lib/registry/regf.idl |