summaryrefslogtreecommitdiff
path: root/source4/heimdal_build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-03-28 00:44:14 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-03-28 00:44:14 +0100
commit18d80bdf1fc5a281358aef29324230698eb434d4 (patch)
treee2515f11577052f42a227bc04541d572d7f2e1ff /source4/heimdal_build
parentac604330871504e88e4bcd37433bbf3717d97a88 (diff)
parente15b35e3897e63b9e815a04101436439d4aebdef (diff)
downloadsamba-18d80bdf1fc5a281358aef29324230698eb434d4.tar.gz
samba-18d80bdf1fc5a281358aef29324230698eb434d4.tar.bz2
samba-18d80bdf1fc5a281358aef29324230698eb434d4.zip
Merge v4.0-test
(This used to be commit 977dbdeaf363c8905ed9fd0570eba4be80582833)
Diffstat (limited to 'source4/heimdal_build')
-rw-r--r--source4/heimdal_build/config.h2
-rw-r--r--source4/heimdal_build/config.mk43
2 files changed, 38 insertions, 7 deletions
diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h
index 7a51def3c6..e2c735a65f 100644
--- a/source4/heimdal_build/config.h
+++ b/source4/heimdal_build/config.h
@@ -19,4 +19,6 @@
#define SIGRETURN(x) return (RETSIGTYPE)(x)
#endif
+#define HDB_DB_DIR ""
+
#endif
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index d3d87f7a70..d58d06f909 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -46,6 +46,7 @@ PRIVATE_DEPENDENCIES = HDB_LDB HEIMDAL_KRB5 HEIMDAL_HDB_KEYS HEIMDAL_ROKEN HEIMD
HEIMDAL_HDB_OBJ_FILES = \
./heimdal/lib/hdb/db.o \
+ ./heimdal/lib/hdb/dbinfo.o \
./heimdal/lib/hdb/hdb.o \
./heimdal/lib/hdb/ext.o \
./heimdal/lib/hdb/keytab.o \
@@ -175,7 +176,7 @@ HEIMDAL_GSSAPI_OBJ_FILES = \
# Start SUBSYSTEM HEIMDAL_KRB5
[SUBSYSTEM::HEIMDAL_KRB5]
CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5
-PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1
+PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND
PUBLIC_DEPENDENCIES = HEIMDAL_KRB5_ASN1 HEIMDAL_GLUE HEIMDAL_HX509 HEIMDAL_HCRYPTO
# End SUBSYSTEM HEIMDAL_KRB5
#######################
@@ -334,8 +335,9 @@ HEIMDAL_HCRYPTO_OBJ_FILES = \
./heimdal/lib/hcrypto/rand-unix.o \
./heimdal/lib/hcrypto/rand-fortuna.o \
./heimdal/lib/hcrypto/rand-timer.o \
- ./heimdal/lib/hcrypto/hmac.o
-
+ ./heimdal/lib/hcrypto/hmac.o \
+ ./heimdal/lib/hcrypto/camellia.o \
+ ./heimdal/lib/hcrypto/camellia-ntt.o
#######################
# Start SUBSYSTEM HEIMDAL_HX509
@@ -347,7 +349,8 @@ PRIVATE_DEPENDENCIES = \
HEIMDAL_CMS_ASN1 HEIMDAL_RFC2459_ASN1 \
HEIMDAL_OCSP_ASN1 HEIMDAL_PKCS8_ASN1 \
HEIMDAL_PKCS9_ASN1 HEIMDAL_PKCS12_ASN1 \
- HEIMDAL_PKINIT_ASN1 HEIMDAL_PKCS10_ASN1
+ HEIMDAL_PKINIT_ASN1 HEIMDAL_PKCS10_ASN1 \
+ HEIMDAL_WIND
# End SUBSYSTEM HEIMDAL_HX509
#######################
@@ -376,6 +379,31 @@ HEIMDAL_HX509_OBJ_FILES = \
./heimdal/lib/hx509/revoke.o \
./heimdal/lib/hx509/hx509_err.o
+#######################
+# Start SUBSYSTEM HEIMDAL_WIND
+[SUBSYSTEM::HEIMDAL_WIND]
+CFLAGS = -Iheimdal_build -Iheimdal/lib/wind
+PRIVATE_DEPENDENCIES = \
+ HEIMDAL_ROKEN HEIMDAL_COM_ERR
+
+HEIMDAL_WIND_OBJ_FILES = \
+ ./heimdal/lib/wind/wind_err.o \
+ ./heimdal/lib/wind/stringprep.o \
+ ./heimdal/lib/wind/errorlist.o \
+ ./heimdal/lib/wind/errorlist_table.o \
+ ./heimdal/lib/wind/normalize.o \
+ ./heimdal/lib/wind/normalize_table.o \
+ ./heimdal/lib/wind/combining.o \
+ ./heimdal/lib/wind/combining_table.o \
+ ./heimdal/lib/wind/utf8.o \
+ ./heimdal/lib/wind/bidi.o \
+ ./heimdal/lib/wind/bidi_table.o \
+ ./heimdal/lib/wind/ldap.o \
+ ./heimdal/lib/wind/map.o \
+ ./heimdal/lib/wind/map_table.o
+# End SUBSYSTEM HEIMDAL_WIND
+#######################
+
[SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME]
CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -Ilib/socket_wrapper
@@ -399,7 +427,7 @@ PUBLIC_DEPENDENCIES = \
HEIMDAL_ROKEN_GETPROGNAME \
HEIMDAL_ROKEN_CLOSEFROM \
RESOLV \
- EXT_SOCKET
+ LIBREPLACE_NETWORK
# End SUBSYSTEM HEIMDAL_ROKEN
#######################
@@ -470,7 +498,7 @@ HEIMDAL_ASN1_COMPILE_LEX_OBJ_FILES = ./heimdal/lib/asn1/lex.ho
[BINARY::asn1_compile]
CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
USE_HOSTCC = YES
-PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H EXT_SOCKET EXT_NSL
+PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBREPLACE_NETWORK
asn1_compile_OBJ_FILES = \
./heimdal/lib/asn1/main.ho \
@@ -513,7 +541,7 @@ HEIMDAL_COM_ERR_COMPILE_LEX_OBJ_FILES = ./heimdal/lib/com_err/lex.ho
[BINARY::compile_et]
CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
USE_HOSTCC = YES
-PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H EXT_SOCKET EXT_NSL
+PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBREPLACE_NETWORK
# End BINARY compile_et
#######################
@@ -554,6 +582,7 @@ mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/krb_err.et heimdal/li
mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/krb5_err.et heimdal/lib/krb5|
mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/gssapi/krb5/gkrb5_err.et heimdal/lib/gssapi|
mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/hx509/hx509_err.et heimdal/lib/hx509|
+mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/wind/wind_err.et heimdal/lib/wind|
clean::
@-rm -f bin/compile_et bin/asn1_compile