summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-11 02:08:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:20:03 -0500
commit2b89817e467c409e5eb20b2a3885941e9accc7eb (patch)
tree1b7c8f037e25fa3a91ef0de3bbe3fe38d74ae84b /source4
parentb81460b1439be9c962f193498e654fe21f987253 (diff)
downloadsamba-2b89817e467c409e5eb20b2a3885941e9accc7eb.tar.gz
samba-2b89817e467c409e5eb20b2a3885941e9accc7eb.tar.bz2
samba-2b89817e467c409e5eb20b2a3885941e9accc7eb.zip
r8305: another attempt at getting heimdal building in the farm
(This used to be commit 2cab29c1e730cf2c8d109513bdb9094769e41a2a)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/smb_build/makefile.pm10
-rw-r--r--source4/heimdal_build/config.mk2
2 files changed, 9 insertions, 3 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 731d28c066..e7febd0b26 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -143,7 +143,7 @@ pch: proto include/includes.h.gch
pch_clean:
-rm -f include/includes.h.gch
-basics: idl proto_exists bin/.SUBSYSTEM_HEIMDAL_EXTERNAL
+basics: idl proto_exists HEIMDAL_EXTERNAL
test: @DEFAULT_TEST_TARGET@
@@ -512,7 +512,13 @@ __EOD__
sub _prepare_custom_rule($)
{
my $ctx = shift;
- return "$ctx->{NAME}:\n\t$ctx->{CMD}\n";
+ return "
+$ctx->{NAME}: bin/.TARGET_$ctx->{NAME}
+
+bin/.TARGET_$ctx->{NAME}:
+ $ctx->{CMD}
+ touch bin/.TARGET_$ctx->{NAME}
+";
}
sub _prepare_proto_rules()
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index f40eadd551..45b82672e4 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -363,7 +363,7 @@ REQUIRED_SUBSYSTEMS = COMPILE_ET LIBREPLACE
#######################
# Start TARGET HEIMDAL_EXTERNAL
-[SUBSYSTEM::HEIMDAL_EXTERNAL]
+[TARGET::HEIMDAL_EXTERNAL]
CMD = heimdal_build/build_external.sh
REQUIRED_SUBSYSTEMS = ASN1_COMPILER
# END TARGET HEIMDAL_EXTERNAL