git.samba.org / kai / samba.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
r15278: Fix recreating symlink every time.
[kai/samba.git] / source4 / heimdal_build / config.mk
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index f1ed7943f4bd453222455fed057e2791f30072a2..8d1b6c5781059ed597e48ff27b8057b9915c3a1d 100644 (file)
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -1,6 +1,7 @@
 #######################
 # Start SUBSYSTEM HEIMDAL_KDC
 [SUBSYSTEM::HEIMDAL_KDC]
+CFLAGS = -Iheimdal_build -Iheimdal/kdc
 OBJ_FILES = \
        ../heimdal/kdc/default_config.o \
        ../heimdal/kdc/kerberos5.o \
@@ -11,12 +12,14 @@ OBJ_FILES = \
        ../heimdal/kdc/kerberos4.o \
        ../heimdal/kdc/kaserver.o \
        ../heimdal/kdc/process.o
+PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_KRB5 HEIMDAL_HDB
 # End SUBSYSTEM HEIMDAL_KDC
 #######################
 
 #######################
 # Start SUBSYSTEM HEIMDAL_HDB
 [SUBSYSTEM::HEIMDAL_HDB]
+CFLAGS = -Iheimdal_build -Iheimdal/lib/hdb
 OBJ_FILES = \
        ../heimdal/lib/hdb/db.o \
        ../heimdal/lib/hdb/hdb.o \
@@ -40,13 +43,14 @@ OBJ_FILES = \
        ../heimdal/lib/hdb/asn1_Salt.o \
        ../heimdal/lib/hdb/asn1_hdb_entry.o \
        ../heimdal/lib/hdb/hdb_err.o
-REQUIRED_SUBSYSTEMS = HDB_LDB
+PUBLIC_DEPENDENCIES = HDB_LDB
 # End SUBSYSTEM HEIMDAL_HDB
 #######################
 
 #######################
 # Start SUBSYSTEM HEIMDAL_GSSAPI
 [SUBSYSTEM::HEIMDAL_GSSAPI]
+CFLAGS = -Iheimdal_build -Iheimdal/lib/gssapi
 OBJ_FILES = \
        ../heimdal/lib/gssapi/init_sec_context.o \
        ../heimdal/lib/gssapi/inquire_cred.o \
@@ -87,17 +91,15 @@ OBJ_FILES = \
        ../heimdal/lib/gssapi/get_mic.o \
        ../heimdal/lib/gssapi/import_name.o \
        ../heimdal/lib/gssapi/init.o
-REQUIRED_SUBSYSTEMS = KERBEROS HEIMDAL_KRB5
+PUBLIC_DEPENDENCIES = KERBEROS HEIMDAL_KRB5 
 # End SUBSYSTEM HEIMDAL_GSSAPI
 #######################
 
 #######################
 # Start SUBSYSTEM HEIMDAL_KRB5
 [SUBSYSTEM::HEIMDAL_KRB5]
-EXTRA_CFLAGS = \
-       -Iheimdal_build -Iheimdal/kdc \
-       -Iheimdal/lib/des -Iheimdal/lib/roken \
-       -DNO_PRINTF_ATTRIBUTE
+CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5 
+PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_DES HEIMDAL_ASN1
 OBJ_FILES = \
        ../heimdal/lib/krb5/acache.o \
        ../heimdal/lib/krb5/add_et_list.o \
@@ -186,10 +188,7 @@ OBJ_FILES = \
 #######################
 # Start SUBSYSTEM HEIMDAL_ASN1
 [SUBSYSTEM::HEIMDAL_ASN1]
-EXTRA_CFLAGS = \
-       -Iheimdal_build -Iheimdal/lib/asn1 \
-       -Iheimdal/kdc -Iheimdal/lib/des \
-       -Iheimdal/lib/roken -DNO_PRINTF_ATTRIBUTE
+CFLAGS = -Iheimdal_build -Iheimdal/lib/asn1
 OBJ_FILES = \
        ../heimdal/lib/asn1/der_get.o \
        ../heimdal/lib/asn1/der_put.o \
@@ -259,16 +258,15 @@ OBJ_FILES = \
        ../heimdal/lib/asn1/asn1_err.o \
        ../heimdal/lib/asn1/asn1_krb5int32.o \
        ../heimdal/lib/asn1/asn1_krb5uint32.o
+PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_COM_ERR
 # End SUBSYSTEM HEIMDAL_KRB5
 #######################
 
 #######################
 # Start SUBSYSTEM HEIMDAL_DES
 [SUBSYSTEM::HEIMDAL_DES]
-EXTRA_CFLAGS = \
-       -Iheimdal_build -Iheimdal/kdc \
-       -Iheimdal/lib/des -Iheimdal/lib/roken \
-       -DNO_PRINTF_ATTRIBUTE
+CFLAGS = -Iheimdal_build -Iheimdal/lib/des 
+PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN
 OBJ_FILES = \
        ../heimdal/lib/des/aes.o \
        ../heimdal/lib/des/des.o \
@@ -280,6 +278,7 @@ OBJ_FILES = \
        ../heimdal/lib/des/rijndael-alg-fst.o \
        ../heimdal/lib/des/rnd_keys.o \
        ../heimdal/lib/des/sha.o \
+       ../heimdal/lib/des/sha256.o \
        ../heimdal/lib/des/ui.o \
        ../heimdal/lib/des/evp.o \
        ../heimdal/lib/des/pkcs5.o \
@@ -295,11 +294,21 @@ OBJ_FILES = ../heimdal/lib/roken/gai_strerror.o
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN_GAI_STRERROR
 [SUBSYSTEM::HEIMDAL_ROKEN_INET_ATON]
+CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
 OBJ_FILES = ../heimdal/lib/roken/inet_aton.o
 
+[SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME]
+CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
+OBJ_FILES = ../heimdal/lib/roken/getprogname.o
+
+[SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME_HOST]
+CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
+OBJ_FILES = ../heimdal/lib/roken/getprogname.ho
+
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN_ADDRINFO
 [SUBSYSTEM::HEIMDAL_ROKEN_ADDRINFO]
+CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
 OBJ_FILES = \
        ../heimdal/lib/roken/getaddrinfo.o \
        ../heimdal/lib/roken/freeaddrinfo.o \
@@ -308,19 +317,17 @@ OBJ_FILES = \
        ../heimdal/lib/roken/freehostent.o \
        ../heimdal/lib/roken/copyhostent.o \
        ../heimdal/lib/roken/hostent_find_fqdn.o
+PRIVATE_DEPENDENCIES = SOCKET
 
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN
 [SUBSYSTEM::HEIMDAL_ROKEN]
-EXTRA_CFLAGS = \
-       -Iheimdal_build -Iheimdal/kdc \
-       -Iheimdal/lib/des -Iheimdal/lib/roken -DNO_PRINTF_ATTRIBUTE
+CFLAGS =  -Iheimdal_build -Iheimdal/lib/roken
 OBJ_FILES = \
        ../heimdal/lib/roken/base64.o \
        ../heimdal/lib/roken/hex.o \
        ../heimdal/lib/roken/bswap.o \
        ../heimdal/lib/roken/get_window_size.o \
-       ../heimdal/lib/roken/getprogname.o \
        ../heimdal/lib/roken/h_errno.o \
        ../heimdal/lib/roken/issuid.o \
        ../heimdal/lib/roken/net_read.o \
@@ -333,45 +340,52 @@ OBJ_FILES = \
        ../heimdal/lib/roken/vis.o \
        ../heimdal/lib/roken/strlwr.o \
        ../heimdal/lib/roken/strsep_copy.o \
+       ../heimdal/lib/roken/strsep.o \
        ../heimdal/lib/roken/strupr.o \
        ../heimdal/lib/roken/strpool.o \
        replace.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                        HEIMDAL_ROKEN_ADDRINFO \
                        HEIMDAL_ROKEN_GAI_STRERROR \
                        HEIMDAL_ROKEN_INET_ATON \
-                       EXT_LIB_XNET
+                       HEIMDAL_ROKEN_GETPROGNAME \
+                       GAI \
+                       NSL
 # End SUBSYSTEM HEIMDAL_ROKEN
 #######################
 
 #######################
 # Start SUBSYSTEM HEIMDAL_GLUE
 [SUBSYSTEM::HEIMDAL_GLUE]
+CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/asn1 -Iheimdal/lib/com_err
 OBJ_FILES = glue.o
-REQUIRED_SUBSYSTEMS = LIBNETIF
+PUBLIC_DEPENDENCIES = LIBNETIF
 # End SUBSYSTEM HEIMDAL_GLUE
 #######################
 
 #######################
 # Start SUBSYSTEM HEIMDAL_COM_ERR
 [SUBSYSTEM::HEIMDAL_COM_ERR]
-EXTRA_CFLAGS = \
-       -Iheimdal_build -Iheimdal/lib/com_err \
-       -Iheimdal/kdc -Iheimdal/lib/des \
-       -Iheimdal/lib/roken -DNO_PRINTF_ATTRIBUTE
+CFLAGS = -Iheimdal_build -Iheimdal/lib/com_err
 OBJ_FILES = \
        ../heimdal/lib/com_err/com_err.o \
        ../heimdal/lib/com_err/error.o
+PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN
 # End SUBSYSTEM HEIMDAL_COM_ERR
 #######################
 
+#######################
+# Start SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX
+[SUBSYSTEM::HEIMDAL_ASN1_COMPILE_LEX]
+CFLAGS = -Iheimdal_build -Iheimdal/lib/asn1 -Iheimdal/lib/roken
+OBJ_FILES = ../heimdal/lib/asn1/lex.ho 
+# End SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX
+#######################
+
 #######################
 # Start BINARY asn1_compile
 [BINARY::asn1_compile]
-EXTRA_CFLAGS = \
-       -Iheimdal_build -Iheimdal/lib/asn1 \
-       -Iheimdal/kdc -Iheimdal/lib/des \
-       -Iheimdal/lib/roken -DNO_PRINTF_ATTRIBUTE
+CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
 OBJ_FILES = \
        ../heimdal/lib/asn1/main.ho \
        ../heimdal/lib/asn1/gen.ho \
@@ -382,13 +396,11 @@ OBJ_FILES = \
        ../heimdal/lib/asn1/gen_glue.ho \
        ../heimdal/lib/asn1/gen_length.ho \
        ../heimdal/lib/asn1/hash.ho \
-       ../heimdal/lib/asn1/lex.ho \
        ../heimdal/lib/asn1/parse.ho \
        ../heimdal/lib/roken/emalloc.ho \
        ../heimdal/lib/roken/getarg.ho \
        ../heimdal/lib/roken/setprogname.ho \
        ../heimdal/lib/roken/strupr.ho \
-       ../heimdal/lib/roken/getprogname.ho \
        ../heimdal/lib/roken/get_window_size.ho \
        ../heimdal/lib/roken/estrdup.ho \
        ../heimdal/lib/roken/ecalloc.ho \
@@ -397,24 +409,33 @@ OBJ_FILES = \
        ../heimdal/lib/vers/print_version.ho \
        ../lib/replace/snprintf.ho \
        ../lib/replace/replace.ho
+PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_HOST
 # End BINARY asn1_compile
 #######################
 
+#######################
+# Start SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX
+[SUBSYSTEM::HEIMDAL_COM_ERR_COMPILE_LEX]
+CFLAGS = -Iheimdal_build -Iheimdal/lib/com_err -Iheimdal/lib/roken
+OBJ_FILES = ../heimdal/lib/com_err/lex.ho 
+# End SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX
+#######################
+
 #######################
 # Start BINARY compile_et
 [BINARY::compile_et]
+CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
 OBJ_FILES = ../heimdal/lib/vers/print_version.ho \
-       ../heimdal/lib/com_err/lex.ho \
        ../heimdal/lib/com_err/parse.ho \
        ../heimdal/lib/com_err/compile_et.ho \
        ../heimdal/lib/roken/getarg.ho \
        ../heimdal/lib/roken/get_window_size.ho \
-       ../heimdal/lib/roken/getprogname.ho \
        ../heimdal/lib/roken/strupr.ho \
        ../heimdal/lib/roken/setprogname.ho \
        replace.ho \
        ../lib/replace/snprintf.ho \
        ../lib/replace/replace.ho
+PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_HOST
 # End BINARY compile_et
 #######################
 
@@ -428,11 +449,17 @@ include perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/heim_err.et|
 include perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/k524_err.et|
 include perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/krb5_err.et|
 
-heimdal/lib/des/hcrypto/%: heimdal/lib/des/% heimdal/lib/des/hcrypto
-       @true
+.SUFFIXES: .hin 
+.hin.h:
+       @cp $< $@
+
+heimdal/lib/roken/vis.h: heimdal/lib/roken/vis.hin
+heimdal/lib/roken/err.h: heimdal/lib/roken/err.hin
+
+include perl_path_wrapper.sh hcrypto-deps.pl heimdal/lib/des/*.h|
 
 heimdal/lib/des/hcrypto: 
-       ln -sf ./../des $@
+       @rm -f $@; ln -s ./../des $@
 
 clean::        
        @-rm -f heimdal/lib/roken/vis.h heimdal/lib/roken/err.h
@@ -442,28 +469,28 @@ clean::
        @-rm -f heimdal/lib/krb5/k524_err.{c,h}
        @-rm -f heimdal/lib/krb5/krb5_err.{c,h}
        @-rm -f bin/compile_et bin/asn1_compile
+       @-rm -f heimdal/lib/krb5/des/hcrypto
 
 #######################
 # Start SUBSYSTEM HEIMDAL
 [LIBRARY::HEIMDAL]
 VERSION = 0.0.1
 SO_VERSION = 0
-EXTRA_CFLAGS = \
-       -Iheimdal_build -Iheimdal/kdc \
-       -Iheimdal/lib/des -Iheimdal/lib/roken \
-       -DNO_PRINTF_ATTRIBUTE
+CFLAGS = -Iheimdal_build
 OBJ_FILES = ../heimdal/lib/vers/print_version.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                LIBREPLACE HEIMDAL_GSSAPI HEIMDAL_KRB5 KERBEROS \
-               HEIMDAL_ASN1 HEIMDAL_DES HEIMDAL_ROKEN \
-               HEIMDAL_COM_ERR HEIMDAL_GLUE EXT_LIB_RESOLV
+               HEIMDAL_GLUE RESOLV
 # End SUBSYSTEM HEIMDAL
 #######################
 
 #######################
 # Start SUBSYSTEM KERBEROS_LIB
 [SUBSYSTEM::KERBEROS_LIB]
-#REQUIRED_SUBSYSTEMS = EXT_LIB_KRB5
-REQUIRED_SUBSYSTEMS = HEIMDAL
+#PUBLIC_DEPENDENCIES = EXT_KRB5
+PUBLIC_DEPENDENCIES = HEIMDAL
 # End SUBSYSTEM KERBEROS_LIB
 #######################
+
+dist:: heimdal/lib/asn1/lex.c heimdal/lib/com_err/lex.c \
+       heimdal/lib/asn1/parse.c heimdal/lib/com_err/parse.c
Kai's WIP code