diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-06-19 22:23:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:18:32 -0500 |
| commit | 2a819d0dfcb02ead63832a2ea5af79f90af82647 (patch) | |
| tree | f0e6beab1d0c5aa0c03b1877cfd99bd9882a7b79 | |
| parent | 134a3075dd5656ca5021ff188f73ec1b80333537 (diff) | |
| download | samba-2a819d0dfcb02ead63832a2ea5af79f90af82647.tar.gz samba-2a819d0dfcb02ead63832a2ea5af79f90af82647.tar.bz2 samba-2a819d0dfcb02ead63832a2ea5af79f90af82647.zip | |
r7761: Don't let phony targets cause a rebuild of the binaries. Thanks
to tridge for the idea on how to do this.
(This used to be commit fc099f24790367ea5b1e5e91085c9ddb8deb6dad)
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 3 | ||||
| -rw-r--r-- | source4/build/smb_build/output.pm | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 97f570114d..bc38cfcf80 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -364,13 +364,14 @@ sub _prepare_objlist_rule($) $output = "$ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST = $tmpdepend\n"; - $output .= "$ctx->{TYPE}_$ctx->{NAME}: "; + $output .= "$ctx->{TARGET}: "; if (defined ($ctx->{TARGET_CFLAGS})) { $output .= "\n\t@\$(MAKE) TARGET_CFLAGS=\"" . join(' ', @{$ctx->{TARGET_CFLAGS}}) . "\" "; } $output .= "\$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJS)\n"; + $output .= "\t\@touch $ctx->{TARGET}\n"; return $output; } diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index 2a19adb94c..49b066f228 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -14,7 +14,7 @@ sub generate_objlist($) { my $subsys = shift; - $subsys->{TARGET} = "$subsys->{TYPE}_$subsys->{NAME}"; + $subsys->{TARGET} = "bin/.$subsys->{TYPE}_$subsys->{NAME}"; $subsys->{OUTPUT} = "\$($subsys->{TYPE}_$subsys->{NAME}_OBJS)"; } |