summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-06-05 22:59:34 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:17:40 -0500
commitba750f50d3f35193f26fa1a6628eaa33afd3c07c (patch)
tree35ce7a88b41051e020c1b52ffa600535e4d05409
parent16eaadc67c12e34d4f6a2aa613e5055dea1bdefa (diff)
downloadsamba-ba750f50d3f35193f26fa1a6628eaa33afd3c07c.tar.gz
samba-ba750f50d3f35193f26fa1a6628eaa33afd3c07c.tar.bz2
samba-ba750f50d3f35193f26fa1a6628eaa33afd3c07c.zip
r7311: Use TARGET_CFLAGS for depend list as well
(This used to be commit 1f7a57d8d82fb759ba8997bc91405add9b46e129)
-rw-r--r--source4/build/smb_build/makefile.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 11d1693ce7..c1f952f508 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -364,13 +364,13 @@ sub _prepare_objlist_rule($)
$output = "$ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST = $tmpdepend\n";
- $output .= "$ctx->{TYPE}_$ctx->{NAME}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST)";
+ $output .= "$ctx->{TYPE}_$ctx->{NAME}: ";
if (defined ($ctx->{TARGET_CFLAGS})) {
- $output .= "\n\t@\$(MAKE) \$($ctx->{TYPE}_$ctx->{NAME}_OBJS) TARGET_CFLAGS=\"" . join(' ', @{$ctx->{TARGET_CFLAGS}}) . "\"\n";
- } else {
- $output .=" \$($ctx->{TYPE}_$ctx->{NAME}_OBJS)\n";
- }
+ $output .= "\n\t@\$(MAKE) TARGET_CFLAGS=\"" . join(' ', @{$ctx->{TARGET_CFLAGS}}) . "\" ";
+ }
+
+ $output .= "\$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJS)\n";
return $output;
}