summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-27 15:38:13 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-27 15:38:13 +0200
commit14b0987c630a424546211c46b8a8c5ca3c038226 (patch)
treeb6492f9ee72a9399759b0ee213b6994e6318d861
parent44ca677e40f86b69aeec680280d527128e123c8f (diff)
downloadsamba-14b0987c630a424546211c46b8a8c5ca3c038226.tar.gz
samba-14b0987c630a424546211c46b8a8c5ca3c038226.tar.bz2
samba-14b0987c630a424546211c46b8a8c5ca3c038226.zip
use varibale for asn1 compiler.
(This used to be commit 4543633ba046836d13da80d07d06c272c3abf9bc)
-rwxr-xr-xsource4/heimdal_build/asn1_deps.pl4
-rw-r--r--source4/heimdal_build/config.mk2
2 files changed, 4 insertions, 2 deletions
diff --git a/source4/heimdal_build/asn1_deps.pl b/source4/heimdal_build/asn1_deps.pl
index 488404fcce..4910d47863 100755
--- a/source4/heimdal_build/asn1_deps.pl
+++ b/source4/heimdal_build/asn1_deps.pl
@@ -29,9 +29,9 @@ if (not defined $options) {
my $header = "$dirname/$prefix.h";
-print "$header: \$(heimdalsrcdir)/$file bin/asn1_compile\n";
+print "$header: \$(heimdalsrcdir)/$file \$(ASN1C)\n";
print "\t\@echo \"Compiling ASN1 file \$(heimdalsrcdir)/$file\"\n";
-print "\t\@\$(builddir)/heimdal_build/asn1_compile_wrapper.sh \$(srcdir) \$(builddir) $dirname bin/asn1_compile \$(heimdalsrcdir)/$file $prefix $options\n\n";
+print "\t\@\$(builddir)/heimdal_build/asn1_compile_wrapper.sh \$(srcdir) \$(builddir) $dirname \$(ASN1C) \$(heimdalsrcdir)/$file $prefix $options\n\n";
open(IN,"heimdal/$file") or die("Can't open heimdal/$file: $!");
my @lines = <IN>;
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index a600a499e5..f13f1d38c4 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -503,6 +503,8 @@ CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken
USE_HOSTCC = YES
PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBREPLACE_NETWORK
+ASN1C = bin/asn1_compile
+
asn1_compile_OBJ_FILES = \
$(heimdalsrcdir)/lib/asn1/main.ho \
$(heimdalsrcdir)/lib/asn1/gen.ho \