summaryrefslogtreecommitdiff
path: root/source4/heimdal_build
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-01-31 09:04:12 +0100
committerStefan Metzmacher <metze@samba.org>2009-01-31 09:04:12 +0100
commit21522e4a9a3b223d29858cb35fe5e61ef8faf5b0 (patch)
tree758d6610b7271527cf0748ee182e4142d7d2ee10 /source4/heimdal_build
parentae19f5acddee6d6507225c0c9a625383255a6d4c (diff)
downloadsamba-21522e4a9a3b223d29858cb35fe5e61ef8faf5b0.tar.gz
samba-21522e4a9a3b223d29858cb35fe5e61ef8faf5b0.tar.bz2
samba-21522e4a9a3b223d29858cb35fe5e61ef8faf5b0.zip
s4:heimdal_build: fix the build of asn1_compile and compile_et
We should not link in heimdal_build/replace.ho twice. HEIMDAL_ROKEN has everything we need.... metze
Diffstat (limited to 'source4/heimdal_build')
-rw-r--r--source4/heimdal_build/internal.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/source4/heimdal_build/internal.mk b/source4/heimdal_build/internal.mk
index 92bef089e4..9e32898a07 100644
--- a/source4/heimdal_build/internal.mk
+++ b/source4/heimdal_build/internal.mk
@@ -656,7 +656,7 @@ HEIMDAL_COM_ERR_OBJ_FILES = \
# Start BINARY asn1_compile
[BINARY::asn1_compile]
USE_HOSTCC = YES
-PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN LIBREPLACE_NETWORK
+PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN
ASN1C = $(builddir)/bin/asn1_compile
@@ -682,7 +682,6 @@ asn1_compile_OBJ_FILES = \
$(asn1_compile_ASN1_OBJ_FILES) \
$(heimdalsrcdir)/lib/vers/print_version.ho \
$(socketwrappersrcdir)/socket_wrapper.ho \
- $(heimdalbuildsrcdir)/replace.ho
$(asn1_compile_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir)
@@ -700,7 +699,7 @@ $(eval $(call heimdal_proto_header_template, \
# Start BINARY compile_et
[BINARY::compile_et]
USE_HOSTCC = YES
-PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN LIBREPLACE_NETWORK
+PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN
# End BINARY compile_et
#######################
@@ -711,7 +710,6 @@ compile_et_OBJ_FILES = $(heimdalsrcdir)/lib/vers/print_version.ho \
$(heimdalsrcdir)/lib/com_err/lex.ho \
$(heimdalsrcdir)/lib/com_err/compile_et.ho \
$(socketwrappersrcdir)/socket_wrapper.ho \
- $(heimdalbuildsrcdir)/replace.ho
$(compile_et_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/com_err -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir)