diff options
Diffstat (limited to 'source4')
39 files changed, 261 insertions, 279 deletions
diff --git a/source4/Makefile b/source4/Makefile index 069fece855..20a0876962 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -49,6 +49,55 @@ endif include $(srcdir)/build/make/rules.mk include $(srcdir)/build/make/python.mk +dynconfigsrcdir := dynconfig +heimdalsrcdir := heimdal +dsdbsrcdir := dsdb +smbdsrcdir := smbd +clustersrcdir := cluster +libnetsrcdir := libnet +authsrcdir := auth +nsswitchsrcdir := nsswitch +libsrcdir := lib +libsocketsrcdir := lib/socket +libcharsetsrcdir := lib/charset +ldb_sambasrcdir := lib/ldb-samba +libtlssrcdir := lib/tls +libregistrysrcdir := lib/registry +smbreadlinesrcdir := lib/smbreadline +libmessagingsrcdir := lib/messaging +libeventssrcdir := lib/events +libcmdlinesrcdir := lib/cmdline +socketwrappersrcdir := lib/socket_wrapper +nsswrappersrcdir := lib/nss_wrapper +appwebsrcdir := lib/appweb +libstreamsrcdir := lib/stream +libutilsrcdir := lib/util +libtdrsrcdir := lib/tdr +libdbwrapsrcdir := lib/dbwrap +libcryptosrcdir := lib/crypto +libtorturesrcdir := lib/torture +smb_serversrcdir := smb_server +libcompressionsrcdir := lib/compression +libgencachesrcdir := lib +paramsrcdir := param +rpc_serversrcdir := rpc_server +ldap_serversrcdir := ldap_server +web_serversrcdir := web_server +winbindsrcdir := winbind +nbt_serversrcdir := nbt_server +wrepl_serversrcdir := wrepl_server +cldap_serversrcdir := cldap_server +utilssrcdir := utils +clientsrcdir := client +torturesrcdir := torture +ntvfssrcdir := ntvfs +ntptrsrcdir := ntptr +librpcsrcdir := librpc +libclisrcdir := libcli +ejsscriptsrcdir := scripting/ejs +pyscriptsrcdir := $(srcdir)/scripting/python +kdcsrcdir := kdc + include data.mk BINARIES += $(BIN_PROGS) $(SBIN_PROGS) diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index 652a52fa60..8c7d75221c 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -25,7 +25,6 @@ my $section_types = { "PUBLIC_DEPENDENCIES" => "list", "ENABLE" => "bool", "LDFLAGS" => "list", - "CFLAGS" => "list", }, "SUBSYSTEM" => { "PRIVATE_DEPENDENCIES" => "list", @@ -60,7 +59,6 @@ my $section_types = { "ENABLE" => "bool", "INSTALLDIR" => "string", - "CFLAGS" => "list", "LDFLAGS" => "list", "STANDARD_VISIBILITY" => "string", diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 0269cfe8a3..73801c25fd 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -262,6 +262,10 @@ sub CFlags($$) if($src_ne_build) { if($flag =~ m#^-I([^/].*$)#) { my $dir = $1; + if ($dir =~ /^\$\(/) { + push (@cflags, $flag); + next; + } $dir =~ s#^\$\((?:src|build)dir\)/?##; push(@cflags, "-I$builddir/$dir", "-I$srcdir/$dir"); next; diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index f9f12c3a73..76c6d3fc8f 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -52,7 +52,7 @@ sub generate_shared_library($) $lib->{RESULT_SHARED_LIBRARY} = "$lib->{SHAREDDIR}/$lib->{LIBRARY_REALNAME}"; $lib->{OUTPUT_SHARED_LIBRARY} = "-l$link_name"; - $lib->{TARGET_SHARED_LIBRARY} = $lib->{RESULT_SHARED_LIBRARY}; + $lib->{TARGET_SHARED_LIBRARY} = "$lib->{SHAREDDIR}/$lib->{LIBRARY_DEBUGNAME}"; } sub generate_merged_obj($) diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk index eae190a85f..388b67c6d1 100644 --- a/source4/dsdb/samdb/ldb_modules/config.mk +++ b/source4/dsdb/samdb/ldb_modules/config.mk @@ -8,7 +8,7 @@ INIT_FUNCTION = LDB_MODULE(objectguid) # End MODULE ldb_objectguid ################################################ -ldb_objectguid_OBJ_FILES = dsdb/samdb/ldb_modules/objectguid.o +ldb_objectguid_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/objectguid.o ################################################ # Start MODULE ldb_repl_meta_data @@ -22,7 +22,7 @@ INIT_FUNCTION = LDB_MODULE(repl_meta_data) ################################################ ldb_repl_meta_data_OBJ_FILES = \ - dsdb/samdb/ldb_modules/repl_meta_data.o + $(dsdbsrcdir)/samdb/ldb_modules/repl_meta_data.o ################################################ # Start MODULE ldb_dsdb_cache @@ -35,7 +35,7 @@ INIT_FUNCTION = LDB_MODULE(dsdb_cache) ################################################ ldb_dsdb_cache_OBJ_FILES = \ - dsdb/samdb/ldb_modules/dsdb_cache.o + $(dsdbsrcdir)/samdb/ldb_modules/dsdb_cache.o ################################################ # Start MODULE ldb_schema_fsmo @@ -48,7 +48,7 @@ INIT_FUNCTION = LDB_MODULE(schema_fsmo) ################################################ ldb_schema_fsmo_OBJ_FILES = \ - dsdb/samdb/ldb_modules/schema_fsmo.o + $(dsdbsrcdir)/samdb/ldb_modules/schema_fsmo.o ################################################ # Start MODULE ldb_naming_fsmo @@ -61,7 +61,7 @@ INIT_FUNCTION = LDB_MODULE(naming_fsmo) ################################################ ldb_naming_fsmo_OBJ_FILES = \ - dsdb/samdb/ldb_modules/naming_fsmo.o + $(dsdbsrcdir)/samdb/ldb_modules/naming_fsmo.o ################################################ # Start MODULE ldb_pdc_fsmo @@ -74,7 +74,7 @@ INIT_FUNCTION = LDB_MODULE(pdc_fsmo) ################################################ ldb_pdc_fsmo_OBJ_FILES = \ - dsdb/samdb/ldb_modules/pdc_fsmo.o + $(dsdbsrcdir)/samdb/ldb_modules/pdc_fsmo.o ################################################ # Start MODULE ldb_samldb @@ -88,7 +88,7 @@ INIT_FUNCTION = LDB_MODULE(samldb) ################################################ ldb_samldb_OBJ_FILES = \ - dsdb/samdb/ldb_modules/samldb.o + $(dsdbsrcdir)/samdb/ldb_modules/samldb.o ################################################ # Start MODULE ldb_samba3sam @@ -102,7 +102,7 @@ PRIVATE_DEPENDENCIES = LIBTALLOC SMBPASSWD NSS_WRAPPER LIBSECURITY \ ################################################ ldb_samba3sam_OBJ_FILES = \ - dsdb/samdb/ldb_modules/samba3sam.o + $(dsdbsrcdir)/samdb/ldb_modules/samba3sam.o ################################################ # Start MODULE ldb_simple_ldap_map @@ -117,7 +117,7 @@ ALIASES = entryuuid nsuniqueid ################################################ ldb_simple_ldap_map_OBJ_FILES = \ - dsdb/samdb/ldb_modules/simple_ldap_map.o + $(dsdbsrcdir)/samdb/ldb_modules/simple_ldap_map.o # ################################################ # # Start MODULE ldb_proxy @@ -141,7 +141,7 @@ INIT_FUNCTION = LDB_MODULE(rootdse) # End MODULE ldb_rootdse ################################################ -ldb_rootdse_OBJ_FILES = dsdb/samdb/ldb_modules/rootdse.o +ldb_rootdse_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/rootdse.o ################################################ # Start MODULE ldb_password_hash @@ -154,7 +154,7 @@ PRIVATE_DEPENDENCIES = HEIMDAL_HDB_KEYS LIBTALLOC HEIMDAL_KRB5 LDAP_ENCODE \ # End MODULE ldb_password_hash ################################################ -ldb_password_hash_OBJ_FILES = dsdb/samdb/ldb_modules/password_hash.o +ldb_password_hash_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/password_hash.o ################################################ # Start MODULE ldb_local_password @@ -166,7 +166,7 @@ INIT_FUNCTION = LDB_MODULE(local_password) # End MODULE ldb_local_password ################################################ -ldb_local_password_OBJ_FILES = dsdb/samdb/ldb_modules/local_password.o +ldb_local_password_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/local_password.o ################################################ # Start MODULE ldb_kludge_acl @@ -179,7 +179,7 @@ INIT_FUNCTION = LDB_MODULE(kludge_acl) # End MODULE ldb_kludge_acl ################################################ -ldb_kludge_acl_OBJ_FILES = dsdb/samdb/ldb_modules/kludge_acl.o +ldb_kludge_acl_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/kludge_acl.o ################################################ # Start MODULE ldb_extended_dn @@ -191,7 +191,7 @@ INIT_FUNCTION = LDB_MODULE(extended_dn) # End MODULE ldb_extended_dn ################################################ -ldb_extended_dn_OBJ_FILES = dsdb/samdb/ldb_modules/extended_dn.o +ldb_extended_dn_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/extended_dn.o ################################################ # Start MODULE ldb_show_deleted @@ -203,7 +203,7 @@ INIT_FUNCTION = LDB_MODULE(show_deleted) # End MODULE ldb_show_deleted ################################################ -ldb_show_deleted_OBJ_FILES = dsdb/samdb/ldb_modules/show_deleted.o +ldb_show_deleted_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/show_deleted.o ################################################ # Start MODULE ldb_partition @@ -215,7 +215,7 @@ INIT_FUNCTION = LDB_MODULE(partition) # End MODULE ldb_partition ################################################ -ldb_partition_OBJ_FILES = dsdb/samdb/ldb_modules/partition.o +ldb_partition_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/partition.o ################################################ # Start MODULE ldb_schema @@ -227,7 +227,7 @@ INIT_FUNCTION = LDB_MODULE(schema) # End MODULE ldb_schema ################################################ -ldb_schema_OBJ_FILES = $(addprefix dsdb/samdb/ldb_modules/, schema.o schema_syntax.o) +ldb_schema_OBJ_FILES = $(addprefix $(dsdbsrcdir)/samdb/ldb_modules/, schema.o schema_syntax.o) ################################################ # Start MODULE ldb_update_kt @@ -240,7 +240,7 @@ INIT_FUNCTION = LDB_MODULE(update_kt) # End MODULE ldb_update_kt ################################################ -ldb_update_keytab_OBJ_FILES = dsdb/samdb/ldb_modules/update_keytab.o +ldb_update_keytab_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/update_keytab.o ################################################ # Start MODULE ldb_objectclass @@ -253,7 +253,7 @@ SUBSYSTEM = LIBLDB # End MODULE ldb_objectclass ################################################ -ldb_objectclass_OBJ_FILES = dsdb/samdb/ldb_modules/objectclass.o +ldb_objectclass_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/objectclass.o ################################################ # Start MODULE ldb_subtree_rename @@ -265,7 +265,7 @@ SUBSYSTEM = LIBLDB # End MODULE ldb_subtree_rename ################################################ -ldb_subtree_rename_OBJ_FILES = dsdb/samdb/ldb_modules/subtree_rename.o +ldb_subtree_rename_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/subtree_rename.o ################################################ # Start MODULE ldb_subtree_rename @@ -277,7 +277,7 @@ SUBSYSTEM = LIBLDB # End MODULE ldb_subtree_rename ################################################ -ldb_subtree_delete_OBJ_FILES = dsdb/samdb/ldb_modules/subtree_delete.o +ldb_subtree_delete_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/subtree_delete.o ################################################ # Start MODULE ldb_linked_attributes @@ -290,7 +290,7 @@ SUBSYSTEM = LIBLDB # End MODULE ldb_linked_attributes ################################################ -ldb_linked_attributes_OBJ_FILES = dsdb/samdb/ldb_modules/linked_attributes.o +ldb_linked_attributes_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/linked_attributes.o ################################################ # Start MODULE ldb_ranged_results @@ -302,7 +302,7 @@ SUBSYSTEM = LIBLDB # End MODULE ldb_ranged_results ################################################ -ldb_ranged_results_OBJ_FILES = dsdb/samdb/ldb_modules/ranged_results.o +ldb_ranged_results_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/ranged_results.o ################################################ # Start MODULE ldb_anr @@ -315,7 +315,7 @@ SUBSYSTEM = LIBLDB # End MODULE ldb_anr ################################################ -ldb_anr_OBJ_FILES = dsdb/samdb/ldb_modules/anr.o +ldb_anr_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/anr.o ################################################ # Start MODULE ldb_normalise @@ -328,7 +328,7 @@ SUBSYSTEM = LIBLDB # End MODULE ldb_normalise ################################################ -ldb_normalise_OBJ_FILES = dsdb/samdb/ldb_modules/normalise.o +ldb_normalise_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/normalise.o ################################################ # Start MODULE ldb_instancetype @@ -341,5 +341,5 @@ SUBSYSTEM = LIBLDB # End MODULE ldb_instancetype ################################################ -ldb_instancetype_OBJ_FILES = dsdb/samdb/ldb_modules/instancetype.o +ldb_instancetype_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/instancetype.o diff --git a/source4/dynconfig.mk b/source4/dynconfig/config.mk index f365911c6a..5f2887f8b6 100644 --- a/source4/dynconfig.mk +++ b/source4/dynconfig/config.mk @@ -1,6 +1,7 @@ [SUBSYSTEM::DYNCONFIG] -DYNCONFIG_OBJ_FILES = dynconfig.o +DYNCONFIG_OBJ_FILES = $(dynconfigsrcdir)/dynconfig.o \ + $(dynconfigsrcdir)/version.o # set these to where to find various files # These can be overridden by command line switches (see smbd(8)) @@ -9,10 +10,7 @@ CONFIGFILE = $(sysconfdir)/smb.conf PKGCONFIGDIR = $(libdir)/pkgconfig LMHOSTSFILE = $(sysconfdir)/lmhosts -dynconfig.o: dynconfig.c Makefile - @echo Compiling $< - @$(CC) $(CFLAGS) $(CPPFLAGS) $(PICFLAG) -c $< -o $@ \ - -DCONFIGFILE=\"$(CONFIGFILE)\" -DBINDIR=\"$(bindir)\" \ +$(dynconfigsrcdir)/dynconfig.o: CFLAGS+=-DCONFIGFILE=\"$(CONFIGFILE)\" -DBINDIR=\"$(bindir)\" \ -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" \ -DLOCKDIR=\"$(lockdir)\" -DPIDDIR=\"$(piddir)\" -DDATADIR=\"$(datadir)\" \ -DLOGFILEBASE=\"$(logfilebase)\" \ @@ -23,4 +21,3 @@ dynconfig.o: dynconfig.c Makefile -DTORTUREDIR=\"$(TORTUREDIR)\" \ -DSETUPDIR=\"$(SETUPDIR)\" -DWINBINDD_SOCKET_DIR=\"$(winbindd_socket_dir)\" - diff --git a/source4/dynconfig.c b/source4/dynconfig/dynconfig.c index 6dbbf872d9..6dbbf872d9 100644 --- a/source4/dynconfig.c +++ b/source4/dynconfig/dynconfig.c diff --git a/source4/dynconfig.h b/source4/dynconfig/dynconfig.h index ac54db63d6..ac54db63d6 100644 --- a/source4/dynconfig.h +++ b/source4/dynconfig/dynconfig.h diff --git a/source4/lib/version.c b/source4/dynconfig/version.c index e81f463586..e81f463586 100644 --- a/source4/lib/version.c +++ b/source4/dynconfig/version.c diff --git a/source4/heimdal_build/asn1_compile_wrapper.sh b/source4/heimdal_build/asn1_compile_wrapper.sh index 96677c7e8e..c449bf8065 100755 --- a/source4/heimdal_build/asn1_compile_wrapper.sh +++ b/source4/heimdal_build/asn1_compile_wrapper.sh @@ -4,21 +4,15 @@ SELF=$0 SELFDIR=`dirname ${SELF}` -SRCDIR=$1 -BUILDDIR=$2 -DESTDIR=$3 +BUILDDIR=$1 +DESTDIR=$2 -CMD=$4 -FILE=$5 -NAME=$6 -shift 6 +CMD=$3 +FILE=$4 +NAME=$5 +shift 5 OPTIONS="$@" -test -z "${SRCDIR}" && { - echo "${SELF}:SRCDIR: '${SRCDIR}'" >&2; - exit 1; -} - test -z "${BUILDDIR}" && { echo "${SELF}:BUILDDIR: '${BUILDDIR}'" >&2; exit 1; @@ -46,14 +40,6 @@ test -z "${NAME}" && { CURDIR=`pwd` -cd ${SRCDIR} && { - ABS_SRCDIR=`pwd` - cd ${CURDIR} -} || { - echo "${SELF}:cannot cd into '${SRCDIR}'" >&2; - exit 1; -} - cd ${BUILDDIR} && { ABS_BUILDDIR=`pwd` cd ${CURDIR} @@ -63,7 +49,7 @@ cd ${BUILDDIR} && { } cd ${DESTDIR} && { - ${ABS_BUILDDIR}/${CMD} ${OPTIONS} ${ABS_SRCDIR}/${FILE} ${NAME} >&2 || exit 1; + ${ABS_BUILDDIR}/${CMD} ${OPTIONS} ${FILE} ${NAME} >&2 || exit 1; cd ${CURDIR} } || { echo "${SELF}:cannot cd into '${BUILDDIR}'" >&2; diff --git a/source4/heimdal_build/asn1_deps.pl b/source4/heimdal_build/asn1_deps.pl index a2fbb5e3d0..6121781760 100755 --- a/source4/heimdal_build/asn1_deps.pl +++ b/source4/heimdal_build/asn1_deps.pl @@ -29,11 +29,11 @@ if (not defined $options) { my $header = "$dirname/$prefix.h"; -print "$header: $file bin/asn1_compile\n"; -print "\t\@echo \"Compiling ASN1 file $file\"\n"; -print "\t\@\$(builddir)/heimdal_build/asn1_compile_wrapper.sh \$(srcdir) \$(builddir) $dirname bin/asn1_compile $file $prefix $options\n\n"; +print "$header: \$(heimdalsrcdir)/$file \$(ASN1C)\n"; +print "\t\@echo \"Compiling ASN1 file \$(heimdalsrcdir)/$file\"\n"; +print "\t\@\$(heimdalbuildsrcdir)/asn1_compile_wrapper.sh \$(builddir) $dirname \$(ASN1C) \$(abspath \$(heimdalsrcdir)/$file) $prefix $options\n\n"; -open(IN,$file) or die("Can't open $file: $!"); +open(IN,"heimdal/$file") or die("Can't open heimdal/$file: $!"); my @lines = <IN>; close(IN); foreach my $line (@lines) { diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index a4f24c9026..17fc8c93ec 100644 --- a/source4/heimdal_build/config.mk +++ b/source4/heimdal_build/config.mk @@ -1,7 +1,9 @@ +heimdalbuildsrcdir = $(heimdalsrcdir)/../heimdal_build + ####################### # Start SUBSYSTEM HEIMDAL_KDC [SUBSYSTEM::HEIMDAL_KDC] -CFLAGS = -Iheimdal_build -Iheimdal/kdc +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/kdc PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_KRB5 HEIMDAL_HDB HEIMDAL_HEIM_ASN1 HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1 PUBLIC_DEPENDENCIES = HEIMDAL_NTLM HEIMDAL_HCRYPTO # End SUBSYSTEM HEIMDAL_KDC @@ -24,14 +26,14 @@ HEIMDAL_KDC_OBJ_FILES = \ $(heimdalsrcdir)/kdc/kx509.o [SUBSYSTEM::HEIMDAL_NTLM] -CFLAGS = -Iheimdal_build -Iheimdal/lib/ntlm +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/ntlm PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_KRB5 HEIMDAL_NTLM_OBJ_FILES = \ $(heimdalsrcdir)/lib/ntlm/ntlm.o [SUBSYSTEM::HEIMDAL_HDB_KEYS] -CFLAGS = -Iheimdal_build -Iheimdal/lib/hdb +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hdb PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_KRB5 \ HEIMDAL_HDB_ASN1 @@ -40,7 +42,7 @@ HEIMDAL_HDB_KEYS_OBJ_FILES = $(heimdalsrcdir)/lib/hdb/keys.o ####################### # Start SUBSYSTEM HEIMDAL_HDB [SUBSYSTEM::HEIMDAL_HDB] -CFLAGS = -Iheimdal_build -Iheimdal/lib/hdb +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hdb PRIVATE_DEPENDENCIES = HDB_LDB HEIMDAL_KRB5 HEIMDAL_HDB_KEYS HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_COM_ERR HEIMDAL_HDB_ASN1 # End SUBSYSTEM HEIMDAL_HDB ####################### @@ -58,7 +60,7 @@ HEIMDAL_HDB_OBJ_FILES = \ ####################### # Start SUBSYSTEM HEIMDAL_GSSAPI [SUBSYSTEM::HEIMDAL_GSSAPI] -CFLAGS = -Iheimdal_build -Iheimdal/lib/gssapi -Iheimdal/lib/gssapi/gssapi -Iheimdal/lib/gssapi/spnego -Iheimdal/lib/gssapi/krb5 -Iheimdal/lib/gssapi/mech +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/gssapi -I$(heimdalsrcdir)/lib/gssapi/gssapi -I$(heimdalsrcdir)/lib/gssapi/spnego -I$(heimdalsrcdir)/lib/gssapi/krb5 -I$(heimdalsrcdir)/lib/gssapi/mech PRIVATE_DEPENDENCIES = HEIMDAL_HCRYPTO HEIMDAL_HEIM_ASN1 HEIMDAL_SPNEGO_ASN1 PUBLIC_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_KRB5 # End SUBSYSTEM HEIMDAL_GSSAPI @@ -176,7 +178,7 @@ HEIMDAL_GSSAPI_OBJ_FILES = \ ####################### # Start SUBSYSTEM HEIMDAL_KRB5 [SUBSYSTEM::HEIMDAL_KRB5] -CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/asn1 -Iheimdal/lib/com_err +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/krb5 -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/com_err PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND PUBLIC_DEPENDENCIES = HEIMDAL_KRB5_ASN1 HEIMDAL_GLUE HEIMDAL_HX509 HEIMDAL_HCRYPTO # End SUBSYSTEM HEIMDAL_KRB5 @@ -273,7 +275,7 @@ HEIMDAL_KRB5_OBJ_FILES = \ ####################### # Start SUBSYSTEM HEIMDAL_HEIM_ASN1 [SUBSYSTEM::HEIMDAL_HEIM_ASN1] -CFLAGS = -Iheimdal_build -Iheimdal/lib/asn1 +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/asn1 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_COM_ERR # End SUBSYSTEM HEIMDAL_KRB5 ####################### @@ -293,7 +295,7 @@ HEIMDAL_HEIM_ASN1_OBJ_FILES = \ ####################### # Start SUBSYSTEM HEIMDAL_HCRYPTO_IMATH [SUBSYSTEM::HEIMDAL_HCRYPTO_IMATH] -CFLAGS = -Iheimdal_build -Iheimdal/lib/hcrypto/imath +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hcrypto/imath PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN # End SUBSYSTEM HEIMDAL_HCRYPTO_IMATH ####################### @@ -303,7 +305,7 @@ HEIMDAL_HCRYPTO_IMATH_OBJ_FILES = \ $(heimdalsrcdir)/lib/hcrypto/imath/iprime.o [SUBSYSTEM::HEIMDAL_HCRYPTO] -CFLAGS = -Iheimdal_build -Iheimdal/lib/hcrypto -Iheimdal/lib +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hcrypto -I$(heimdalsrcdir)/lib PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HEIM_ASN1 HEIMDAL_HCRYPTO_IMATH HEIMDAL_RFC2459_ASN1 # End SUBSYSTEM HEIMDAL_HCRYPTO ####################### @@ -343,7 +345,7 @@ HEIMDAL_HCRYPTO_OBJ_FILES = \ ####################### # Start SUBSYSTEM HEIMDAL_HX509 [SUBSYSTEM::HEIMDAL_HX509] -CFLAGS = -Iheimdal_build -Iheimdal/lib/hx509 +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hx509 PRIVATE_DEPENDENCIES = \ HEIMDAL_ROKEN HEIMDAL_COM_ERR \ HEIMDAL_HEIM_ASN1 HEIMDAL_HCRYPTO \ @@ -383,7 +385,7 @@ HEIMDAL_HX509_OBJ_FILES = \ ####################### # Start SUBSYSTEM HEIMDAL_WIND [SUBSYSTEM::HEIMDAL_WIND] -CFLAGS = -Iheimdal_build -Iheimdal/lib/wind +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/wind PRIVATE_DEPENDENCIES = \ HEIMDAL_ROKEN HEIMDAL_COM_ERR @@ -406,24 +408,24 @@ HEIMDAL_WIND_OBJ_FILES = \ ####################### [SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME] -CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -Ilib/socket_wrapper HEIMDAL_ROKEN_GETPROGNAME_OBJ_FILES = $(heimdalsrcdir)/lib/roken/getprogname.o +$(HEIMDAL_ROKEN_GETPROGNAME_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) [SUBSYSTEM::HEIMDAL_ROKEN_CLOSEFROM] -CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -Ilib/socket_wrapper HEIMDAL_ROKEN_CLOSEFROM_OBJ_FILES = $(heimdalsrcdir)/lib/roken/closefrom.o +$(HEIMDAL_ROKEN_CLOSEFROM_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) [SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME_H] -CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -Ilib/socket_wrapper HEIMDAL_ROKEN_GETPROGNAME_H_OBJ_FILES = $(heimdalsrcdir)/lib/roken/getprogname.ho +$(HEIMDAL_ROKEN_GETPROGNAME_H_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) ####################### # Start SUBSYSTEM HEIMDAL_ROKEN [SUBSYSTEM::HEIMDAL_ROKEN] -CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -Ilib/socket_wrapper +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) PUBLIC_DEPENDENCIES = \ HEIMDAL_ROKEN_GETPROGNAME \ HEIMDAL_ROKEN_CLOSEFROM \ @@ -461,22 +463,22 @@ HEIMDAL_ROKEN_OBJ_FILES = \ $(heimdalsrcdir)/lib/roken/simple_exec.o \ $(heimdalsrcdir)/lib/roken/strcollect.o \ $(heimdalsrcdir)/lib/roken/rtbl.o \ - ./heimdal_build/replace.o + $(heimdalbuildsrcdir)/replace.o ####################### # Start SUBSYSTEM HEIMDAL_GLUE [SUBSYSTEM::HEIMDAL_GLUE] -CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/asn1 -Iheimdal/lib/com_err +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/krb5 -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/com_err PUBLIC_DEPENDENCIES = LIBNETIF LIBSAMBA-HOSTCONFIG # End SUBSYSTEM HEIMDAL_GLUE ####################### -HEIMDAL_GLUE_OBJ_FILES = heimdal_build/glue.o +HEIMDAL_GLUE_OBJ_FILES = $(heimdalbuildsrcdir)/glue.o ####################### # Start SUBSYSTEM HEIMDAL_COM_ERR [SUBSYSTEM::HEIMDAL_COM_ERR] -CFLAGS = -Iheimdal_build -Iheimdal/lib/com_err +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/com_err PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN # End SUBSYSTEM HEIMDAL_COM_ERR ####################### @@ -488,19 +490,20 @@ HEIMDAL_COM_ERR_OBJ_FILES = \ ####################### # Start SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX [SUBSYSTEM::HEIMDAL_ASN1_COMPILE_LEX] -CFLAGS = -Iheimdal_build -Iheimdal/lib/asn1 -Iheimdal/lib/roken -Ilib/socket_wrapper # End SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX ####################### HEIMDAL_ASN1_COMPILE_LEX_OBJ_FILES = $(heimdalsrcdir)/lib/asn1/lex.ho +$(HEIMDAL_ASN1_COMPILE_LEX_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) ####################### # Start BINARY asn1_compile [BINARY::asn1_compile] -CFLAGS = -Iheimdal_build -Iheimdal/lib/roken USE_HOSTCC = YES PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBREPLACE_NETWORK +ASN1C = $(builddir)/bin/asn1_compile + asn1_compile_OBJ_FILES = \ $(heimdalsrcdir)/lib/asn1/main.ho \ $(heimdalsrcdir)/lib/asn1/gen.ho \ @@ -522,8 +525,10 @@ asn1_compile_OBJ_FILES = \ $(heimdalsrcdir)/lib/roken/ecalloc.ho \ $(heimdalsrcdir)/lib/asn1/symbol.ho \ $(heimdalsrcdir)/lib/vers/print_version.ho \ - ./lib/socket_wrapper/socket_wrapper.ho \ - ./heimdal_build/replace.ho + $(socketwrappersrcdir)/socket_wrapper.ho \ + $(heimdalbuildsrcdir)/replace.ho + +$(asn1_compile_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(heimdalsrcdir)/lib/asn1 # End BINARY asn1_compile ####################### @@ -531,7 +536,7 @@ asn1_compile_OBJ_FILES = \ ####################### # Start SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX [SUBSYSTEM::HEIMDAL_COM_ERR_COMPILE_LEX] -CFLAGS = -Iheimdal_build -Iheimdal/lib/com_err -Iheimdal/lib/roken -Ilib/socket_wrapper +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/com_err -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) # End SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX ####################### @@ -540,12 +545,13 @@ HEIMDAL_COM_ERR_COMPILE_LEX_OBJ_FILES = $(heimdalsrcdir)/lib/com_err/lex.ho ####################### # Start BINARY compile_et [BINARY::compile_et] -CFLAGS = -Iheimdal_build -Iheimdal/lib/roken USE_HOSTCC = YES PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBREPLACE_NETWORK # End BINARY compile_et ####################### +ET_COMPILER = $(builddir)/bin/compile_et + compile_et_OBJ_FILES = $(heimdalsrcdir)/lib/vers/print_version.ho \ $(heimdalsrcdir)/lib/com_err/parse.ho \ $(heimdalsrcdir)/lib/com_err/compile_et.ho \ @@ -553,37 +559,38 @@ compile_et_OBJ_FILES = $(heimdalsrcdir)/lib/vers/print_version.ho \ $(heimdalsrcdir)/lib/roken/get_window_size.ho \ $(heimdalsrcdir)/lib/roken/strupr.ho \ $(heimdalsrcdir)/lib/roken/setprogname.ho \ - ./lib/socket_wrapper/socket_wrapper.ho \ - ./heimdal_build/replace.ho - - -mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/hdb/hdb.asn1 hdb_asn1 heimdal/lib/hdb | -mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/gssapi/spnego/spnego.asn1 spnego_asn1 heimdal/lib/gssapi --sequence=MechTypeList | -mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/gssapi/mech/gssapi.asn1 gssapi_asn1 heimdal/lib/gssapi| -mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/asn1/k5.asn1 krb5_asn1 heimdal/lib/asn1 --encode-rfc1510-bit-string --sequence=KRB5SignedPathPrincipals --sequence=AuthorizationData --sequence=METHOD-DATA| -mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/asn1/digest.asn1 digest_asn1 heimdal/lib/asn1| -mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/asn1/pkcs8.asn1 pkcs8_asn1 heimdal/lib/asn1| -mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/asn1/pkcs9.asn1 pkcs9_asn1 heimdal/lib/asn1| -mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/asn1/pkcs12.asn1 pkcs12_asn1 heimdal/lib/asn1| -mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/asn1/rfc2459.asn1 rfc2459_asn1 heimdal/lib/asn1 --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints| -mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/asn1/pkinit.asn1 pkinit_asn1 heimdal/lib/asn1| -mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/asn1/CMS.asn1 cms_asn1 heimdal/lib/asn1| -mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/hx509/ocsp.asn1 ocsp_asn1 heimdal/lib/hx509 --preserve-binary=OCSPTBSRequest --preserve-binary=OCSPResponseData| -mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/asn1/kx509.asn1 kx509_asn1 heimdal/lib/asn1| -mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/hx509/pkcs10.asn1 pkcs10_asn1 heimdal/lib/hx509 --preserve-binary=CertificationRequestInfo| + $(socketwrappersrcdir)/socket_wrapper.ho \ + $(heimdalbuildsrcdir)/replace.ho + +$(compile_et_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken + +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hdb/hdb.asn1 hdb_asn1 \$\(heimdalsrcdir\)/lib/hdb | +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/gssapi/spnego/spnego.asn1 spnego_asn1 \$\(heimdalsrcdir\)/lib/gssapi --sequence=MechTypeList | +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/gssapi/mech/gssapi.asn1 gssapi_asn1 \$\(heimdalsrcdir\)/lib/gssapi| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/k5.asn1 krb5_asn1 \$\(heimdalsrcdir\)/lib/asn1 --encode-rfc1510-bit-string --sequence=KRB5SignedPathPrincipals --sequence=AuthorizationData --sequence=METHOD-DATA| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/digest.asn1 digest_asn1 \$\(heimdalsrcdir\)/lib/asn1| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkcs8.asn1 pkcs8_asn1 \$\(heimdalsrcdir\)/lib/asn1| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkcs9.asn1 pkcs9_asn1 \$\(heimdalsrcdir\)/lib/asn1| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkcs12.asn1 pkcs12_asn1 \$\(heimdalsrcdir\)/lib/asn1| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/rfc2459.asn1 rfc2459_asn1 \$\(heimdalsrcdir\)/lib/asn1 --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkinit.asn1 pkinit_asn1 \$\(heimdalsrcdir\)/lib/asn1| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/CMS.asn1 cms_asn1 \$\(heimdalsrcdir\)/lib/asn1| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hx509/ocsp.asn1 ocsp_asn1 \$\(heimdalsrcdir\)/lib/hx509 --preserve-binary=OCSPTBSRequest --preserve-binary=OCSPResponseData| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/kx509.asn1 kx509_asn1 \$\(heimdalsrcdir\)/lib/asn1| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hx509/pkcs10.asn1 pkcs10_asn1 \$\(heimdalsrcdir\)/lib/hx509 --preserve-binary=CertificationRequestInfo| # # Ensure to update ./static_deps.mk when you add a new entry here! # -mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/asn1/asn1_err.et heimdal/lib/asn1| -mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/hdb/hdb_err.et heimdal/lib/hdb| -mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/heim_err.et heimdal/lib/krb5| -mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/k524_err.et heimdal/lib/krb5| -mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/krb_err.et heimdal/lib/krb5| -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| +mkinclude perl_path_wrapper.sh et_deps.pl lib/asn1/asn1_err.et \$\(heimdalsrcdir\)/lib/asn1| +mkinclude perl_path_wrapper.sh et_deps.pl lib/hdb/hdb_err.et \$\(heimdalsrcdir\)/lib/hdb| +mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/heim_err.et \$\(heimdalsrcdir\)/lib/krb5| +mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/k524_err.et \$\(heimdalsrcdir\)/lib/krb5| +mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/krb_err.et \$\(heimdalsrcdir\)/lib/krb5| +mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/krb5_err.et \$\(heimdalsrcdir\)/lib/krb5| +mkinclude perl_path_wrapper.sh et_deps.pl lib/gssapi/krb5/gkrb5_err.et \$\(heimdalsrcdir\)/lib/gssapi| +mkinclude perl_path_wrapper.sh et_deps.pl lib/hx509/hx509_err.et \$\(heimdalsrcdir\)/lib/hx509| +mkinclude perl_path_wrapper.sh et_deps.pl lib/wind/wind_err.et \$\(heimdalsrcdir\)/lib/wind| clean:: @-rm -f bin/compile_et bin/asn1_compile @@ -591,7 +598,7 @@ clean:: ####################### # Start SUBSYSTEM HEIMDAL [SUBSYSTEM::HEIMDAL] -CFLAGS = -Iheimdal_build +CFLAGS = -I$(heimdalbuildsrcdir) PUBLIC_DEPENDENCIES = \ HEIMDAL_GSSAPI HEIMDAL_KRB5 # End SUBSYSTEM HEIMDAL @@ -602,7 +609,6 @@ HEIMDAL_OBJ_FILES = $(heimdalsrcdir)/lib/vers/print_version.o ####################### # Start BINARY compile_et [BINARY::samba4kinit] -CFLAGS = -Iheimdal_build -Iheimdal/lib/roken PRIVATE_DEPENDENCIES = HEIMDAL_KRB5 HEIMDAL_NTLM # End BINARY compile_et ####################### @@ -612,5 +618,7 @@ samba4kinit_OBJ_FILES = $(heimdalsrcdir)/kuser/kinit.o \ $(heimdalsrcdir)/lib/roken/setprogname.o \ $(heimdalsrcdir)/lib/roken/getarg.o +$(samba4kinit_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken + dist:: $(heimdalsrcdir)/lib/asn1/lex.c $(heimdalsrcdir)/lib/com_err/lex.c \ $(heimdalsrcdir)/lib/asn1/parse.c $(heimdalsrcdir)/lib/com_err/parse.c diff --git a/source4/heimdal_build/et_compile_wrapper.sh b/source4/heimdal_build/et_compile_wrapper.sh index d7d47ba363..ec3b39ff56 100755 --- a/source4/heimdal_build/et_compile_wrapper.sh +++ b/source4/heimdal_build/et_compile_wrapper.sh @@ -4,19 +4,13 @@ SELF=$0 SELFDIR=`dirname ${SELF}` -SRCDIR=$1 -BUILDDIR=$2 -DESTDIR=$3 +BUILDDIR=$1 +DESTDIR=$2 -CMD=$4 -FILE=$5 -SOURCE=$6 -shift 6 - -test -z "${SRCDIR}" && { - echo "${SELF}:SRCDIR: '${SRCDIR}'" >&2; - exit 1; -} +CMD=$3 +FILE=$4 +SOURCE=$5 +shift 5 test -z "${BUILDDIR}" && { echo "${SELF}:BUILDDIR: '${BUILDDIR}'" >&2; @@ -45,14 +39,6 @@ test -z "${SOURCE}" && { CURDIR=`pwd` -cd ${SRCDIR} && { - ABS_SRCDIR=`pwd` - cd ${CURDIR} -} || { - echo "${SELF}:cannot cd into '${SRCDIR}'" >&2; - exit 1; -} - cd ${BUILDDIR} && { ABS_BUILDDIR=`pwd` cd ${CURDIR} @@ -62,7 +48,7 @@ cd ${BUILDDIR} && { } cd ${DESTDIR} && { - ${ABS_BUILDDIR}/${CMD} ${ABS_SRCDIR}/${FILE} >&2 || exit 1; + ${ABS_BUILDDIR}/${CMD} ${FILE} >&2 || exit 1; cd ${CURDIR} TMP="${SOURCE}.$$" mv ${SOURCE} ${TMP} && { diff --git a/source4/heimdal_build/et_deps.pl b/source4/heimdal_build/et_deps.pl index 2385dbd085..6a0485bb54 100755 --- a/source4/heimdal_build/et_deps.pl +++ b/source4/heimdal_build/et_deps.pl @@ -8,9 +8,9 @@ my $basename = basename($file); my $header = "$dirname/$basename"; $header =~ s/\.et$/.h/; my $source = "$dirname/$basename"; $source =~ s/\.et$/.c/; -print "$header $source: $file bin/compile_et\n"; +print "$header $source: \$(heimdalsrcdir)/$file \$(ET_COMPILER)\n"; print "\t\@echo \"Compiling error table $file\"\n"; -print "\t\@\$(builddir)/heimdal_build/et_compile_wrapper.sh \$(srcdir) \$(builddir) $dirname bin/compile_et $file $source\n\n"; +print "\t\@\$(heimdalbuildsrcdir)/et_compile_wrapper.sh \$(builddir) $dirname \$(ET_COMPILER) \$(abspath \$(heimdalsrcdir)/$file) $source\n\n"; print "clean:: \n"; print "\t\@rm -f $header $source\n\n"; diff --git a/source4/lib/charset/util_unistr.c b/source4/lib/charset/util_unistr.c index c496c5d905..19a4f3236c 100644 --- a/source4/lib/charset/util_unistr.c +++ b/source4/lib/charset/util_unistr.c @@ -20,7 +20,7 @@ #include "includes.h" #include "system/locale.h" -#include "dynconfig.h" +#include "dynconfig/dynconfig.h" #include "param/param.h" /** diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c index 73b3eecfbf..96d8b8b40a 100644 --- a/source4/lib/cmdline/popt_common.c +++ b/source4/lib/cmdline/popt_common.c @@ -23,7 +23,7 @@ #include "version.h" #include "lib/cmdline/popt_common.h" #include "param/param.h" -#include "dynconfig.h" +#include "dynconfig/dynconfig.h" /* Handle command line options: * -d,--debuglevel diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index e8852980f6..cc8f1e36ab 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -2,11 +2,11 @@ # Start MODULE ldb_asq [MODULE::ldb_asq] PRIVATE_DEPENDENCIES = LIBTALLOC -CFLAGS = -Ilib/ldb/include +CFLAGS = -I$(ldbdir)/include INIT_FUNCTION = LDB_MODULE(asq) SUBSYSTEM = LIBLDB -ldb_asq_OBJ_FILES = lib/ldb/modules/asq.o +ldb_asq_OBJ_FILES = $(ldbdir)/modules/asq.o # End MODULE ldb_asq ################################################ @@ -14,106 +14,106 @@ ldb_asq_OBJ_FILES = lib/ldb/modules/asq.o # Start MODULE ldb_server_sort [MODULE::ldb_server_sort] PRIVATE_DEPENDENCIES = LIBTALLOC -CFLAGS = -Ilib/ldb/include +CFLAGS = -I$(ldbdir)/include INIT_FUNCTION = LDB_MODULE(server_sort) SUBSYSTEM = LIBLDB # End MODULE ldb_sort ################################################ -ldb_server_sort_OBJ_FILES = lib/ldb/modules/sort.o +ldb_server_sort_OBJ_FILES = $(ldbdir)/modules/sort.o ################################################ # Start MODULE ldb_paged_results [MODULE::ldb_paged_results] INIT_FUNCTION = LDB_MODULE(paged_results) -CFLAGS = -Ilib/ldb/include +CFLAGS = -I$(ldbdir)/include PRIVATE_DEPENDENCIES = LIBTALLOC SUBSYSTEM = LIBLDB # End MODULE ldb_paged_results ################################################ -ldb_paged_results_OBJ_FILES = lib/ldb/modules/paged_results.o +ldb_paged_results_OBJ_FILES = $(ldbdir)/modules/paged_results.o ################################################ # Start MODULE ldb_paged_results [MODULE::ldb_paged_searches] INIT_FUNCTION = LDB_MODULE(paged_searches) -CFLAGS = -Ilib/ldb/include +CFLAGS = -I$(ldbdir)/include PRIVATE_DEPENDENCIES = LIBTALLOC SUBSYSTEM = LIBLDB # End MODULE ldb_paged_results ################################################ -ldb_paged_searches_OBJ_FILES = lib/ldb/modules/paged_searches.o +ldb_paged_searches_OBJ_FILES = $(ldbdir)/modules/paged_searches.o ################################################ # Start MODULE ldb_operational [MODULE::ldb_operational] SUBSYSTEM = LIBLDB -CFLAGS = -Ilib/ldb/include +CFLAGS = -I$(ldbdir)/include PRIVATE_DEPENDENCIES = LIBTALLOC INIT_FUNCTION = LDB_MODULE(operational) # End MODULE ldb_operational ################################################ -ldb_operational_OBJ_FILES = lib/ldb/modules/operational.o +ldb_operational_OBJ_FILES = $(ldbdir)/modules/operational.o ################################################ # Start MODULE ldb_rdn_name [MODULE::ldb_rdn_name] SUBSYSTEM = LIBLDB -CFLAGS = -Ilib/ldb/include +CFLAGS = -I$(ldbdir)/include PRIVATE_DEPENDENCIES = LIBTALLOC INIT_FUNCTION = LDB_MODULE(rdn_name) # End MODULE ldb_rdn_name ################################################ -ldb_rdn_name_OBJ_FILES = lib/ldb/modules/rdn_name.o +ldb_rdn_name_OBJ_FILES = $(ldbdir)/modules/rdn_name.o -ldb_map_OBJ_FILES = $(addprefix lib/ldb/ldb_map/, ldb_map_inbound.o ldb_map_outbound.o ldb_map.o) +ldb_map_OBJ_FILES = $(addprefix $(ldbdir)/ldb_map/, ldb_map_inbound.o ldb_map_outbound.o ldb_map.o) -$(ldb_map_OBJ_FILES): CFLAGS+=-Ilib/ldb/ldb_map +$(ldb_map_OBJ_FILES): CFLAGS+=-I$(ldbdir)/ldb_map ################################################ # Start MODULE ldb_skel [MODULE::ldb_skel] SUBSYSTEM = LIBLDB -CFLAGS = -Ilib/ldb/include +CFLAGS = -I$(ldbdir)/include PRIVATE_DEPENDENCIES = LIBTALLOC INIT_FUNCTION = LDB_MODULE(skel) # End MODULE ldb_skel ################################################ -ldb_skel_OBJ_FILES = lib/ldb/modules/skel.o +ldb_skel_OBJ_FILES = $(ldbdir)/modules/skel.o ################################################ # Start MODULE ldb_sqlite3 [MODULE::ldb_sqlite3] SUBSYSTEM = LIBLDB -CFLAGS = -Ilib/ldb/include +CFLAGS = -I$(ldbdir)/include PRIVATE_DEPENDENCIES = LIBTALLOC SQLITE3 LIBTALLOC # End MODULE ldb_sqlite3 ################################################ -ldb_sqlite3_OBJ_FILES = lib/ldb/ldb_sqlite3/ldb_sqlite3.o +ldb_sqlite3_OBJ_FILES = $(ldbdir)/ldb_sqlite3/ldb_sqlite3.o ################################################ # Start MODULE ldb_tdb [MODULE::ldb_tdb] SUBSYSTEM = LIBLDB -CFLAGS = -Ilib/ldb/include -Ilib/ldb/ldb_tdb +CFLAGS = -I$(ldbdir)/include -I$(ldbdir)/ldb_tdb PRIVATE_DEPENDENCIES = \ LIBTDB LIBTALLOC # End MODULE ldb_tdb ################################################ -ldb_tdb_OBJ_FILES = $(addprefix lib/ldb/ldb_tdb/, ldb_tdb.o ldb_search.o ldb_pack.o ldb_index.o ldb_cache.o ldb_tdb_wrap.o) +ldb_tdb_OBJ_FILES = $(addprefix $(ldbdir)/ldb_tdb/, ldb_tdb.o ldb_search.o ldb_pack.o ldb_index.o ldb_cache.o ldb_tdb_wrap.o) ################################################ # Start SUBSYSTEM ldb [LIBRARY::LIBLDB] -CFLAGS = -Ilib/ldb/include +CFLAGS = -I$(ldbdir)/include INIT_FUNCTION_TYPE = extern const struct ldb_module_ops PUBLIC_DEPENDENCIES = \ LIBTALLOC @@ -128,7 +128,9 @@ PC_FILES += $(ldbdir)/ldb.pc LIBLDB_VERSION = 0.0.1 LIBLDB_SOVERSION = 0 -LIBLDB_OBJ_FILES = $(addprefix lib/ldb/common/, ldb.o ldb_ldif.o ldb_parse.o ldb_msg.o ldb_utf8.o ldb_debug.o ldb_modules.o ldb_match.o ldb_attributes.o attrib_handlers.o ldb_dn.o ldb_controls.o qsort.o) $(ldb_map_OBJ_FILES) +LIBLDB_OBJ_FILES = $(addprefix $(ldbdir)/common/, ldb.o ldb_ldif.o ldb_parse.o ldb_msg.o ldb_utf8.o ldb_debug.o ldb_modules.o ldb_match.o ldb_attributes.o attrib_handlers.o ldb_dn.o ldb_controls.o qsort.o) $(ldb_map_OBJ_FILES) + +$(LIBLDB_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include PUBLIC_HEADERS += $(ldbdir)/include/ldb.h $(ldbdir)/include/ldb_errors.h @@ -142,7 +144,7 @@ PRIVATE_DEPENDENCIES = \ # End BINARY ldbtest ################################################ -ldbtest_OBJ_FILES = lib/ldb/tools/ldbtest.o +ldbtest_OBJ_FILES = $(ldbdir)/tools/ldbtest.o ################################################ # Start BINARY oLschema2ldif @@ -154,7 +156,7 @@ PRIVATE_DEPENDENCIES = \ ################################################ -oLschema2ldif_OBJ_FILES = $(addprefix lib/ldb/tools/, convert.o oLschema2ldif.o) +oLschema2ldif_OBJ_FILES = $(addprefix $(ldbdir)/tools/, convert.o oLschema2ldif.o) MANPAGES += $(ldbdir)/man/oLschema2ldif.1 @@ -167,7 +169,7 @@ PRIVATE_DEPENDENCIES = \ # End BINARY ad2oLschema ################################################ -ad2oLschema_OBJ_FILES = $(addprefix lib/ldb/tools/, convert.o ad2oLschema.o) +ad2oLschema_OBJ_FILES = $(addprefix $(ldbdir)/tools/, convert.o ad2oLschema.o) MANPAGES += $(ldbdir)/man/ad2oLschema.1 diff --git a/source4/lib/ldb/ldb_ildap/config.mk b/source4/lib/ldb/ldb_ildap/config.mk index 1b534645b6..94e3380038 100644 --- a/source4/lib/ldb/ldb_ildap/config.mk +++ b/source4/lib/ldb/ldb_ildap/config.mk @@ -2,12 +2,12 @@ # Start MODULE ldb_ildap [MODULE::ldb_ildap] SUBSYSTEM = LIBLDB -CFLAGS = -Ilib/ldb/include +CFLAGS = -I$(ldbdir)/include OUTPUT_TYPE = SHARED_LIBRARY PRIVATE_DEPENDENCIES = LIBTALLOC LIBCLI_LDAP CREDENTIALS ALIASES = ldapi ldaps ldap # End MODULE ldb_ildap ################################################ -ldb_ildap_OBJ_FILES = lib/ldb/ldb_ildap/ldb_ildap.o +ldb_ildap_OBJ_FILES = $(ldbdir)/ldb_ildap/ldb_ildap.o diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk index 89aba8f276..5325446e1e 100644 --- a/source4/lib/ldb/python.mk +++ b/source4/lib/ldb/python.mk @@ -1,10 +1,10 @@ [PYTHON::swig_ldb] LIBRARY_REALNAME = _ldb.$(SHLIBEXT) PUBLIC_DEPENDENCIES = LIBLDB -CFLAGS = -Ilib/ldb/include -swig_ldb_OBJ_FILES = lib/ldb/ldb_wrap.o +swig_ldb_OBJ_FILES = $(ldbdir)/ldb_wrap.o +$(swig_ldb_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include -$(eval $(call python_py_module_template,ldb.py,lib/ldb/ldb.py)) +$(eval $(call python_py_module_template,ldb.py,$(ldbdir)/ldb.py)) $(swig_ldb_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL) diff --git a/source4/lib/ldb/tools/config.mk b/source4/lib/ldb/tools/config.mk index 6729636434..051fd0c57b 100644 --- a/source4/lib/ldb/tools/config.mk +++ b/source4/lib/ldb/tools/config.mk @@ -1,13 +1,13 @@ ################################################ # Start SUBSYSTEM LIBLDB_CMDLINE [SUBSYSTEM::LIBLDB_CMDLINE] -CFLAGS = -Ilib/ldb -Ilib/ldb/include +CFLAGS = -I$(ldbdir) -I$(ldbdir)/include PUBLIC_DEPENDENCIES = LIBLDB LIBPOPT PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL POPT_SAMBA POPT_CREDENTIALS gensec # End SUBSYSTEM LIBLDB_CMDLINE ################################################ -LIBLDB_CMDLINE_OBJ_FILES = lib/ldb/tools/cmdline.o +LIBLDB_CMDLINE_OBJ_FILES = $(ldbdir)/tools/cmdline.o ################################################ # Start BINARY ldbadd @@ -19,7 +19,7 @@ PRIVATE_DEPENDENCIES = \ ################################################ -ldbadd_OBJ_FILES = lib/ldb/tools/ldbadd.o +ldbadd_OBJ_FILES = $(ldbdir)/tools/ldbadd.o MANPAGES += $(ldbdir)/man/ldbadd.1 @@ -32,7 +32,7 @@ PRIVATE_DEPENDENCIES = \ # End BINARY ldbdel ################################################ -ldbdel_OBJ_FILES = lib/ldb/tools/ldbdel.o +ldbdel_OBJ_FILES = $(ldbdir)/tools/ldbdel.o MANPAGES += $(ldbdir)/man/ldbdel.1 @@ -45,7 +45,7 @@ PRIVATE_DEPENDENCIES = \ # End BINARY ldbmodify ################################################ -ldbmodify_OBJ_FILES = lib/ldb/tools/ldbmodify.o +ldbmodify_OBJ_FILES = $(ldbdir)/tools/ldbmodify.o MANPAGES += $(ldbdir)/man/ldbmodify.1 ################################################ @@ -57,7 +57,7 @@ PRIVATE_DEPENDENCIES = \ # End BINARY ldbsearch ################################################ -ldbsearch_OBJ_FILES = lib/ldb/tools/ldbsearch.o +ldbsearch_OBJ_FILES = $(ldbdir)/tools/ldbsearch.o MANPAGES += $(ldbdir)/man/ldbsearch.1 @@ -70,7 +70,7 @@ PRIVATE_DEPENDENCIES = \ # End BINARY ldbedit ################################################ -ldbedit_OBJ_FILES = lib/ldb/tools/ldbedit.o +ldbedit_OBJ_FILES = $(ldbdir)/tools/ldbedit.o MANPAGES += $(ldbdir)/man/ldbedit.1 @@ -83,7 +83,7 @@ PRIVATE_DEPENDENCIES = \ # End BINARY ldbrename ################################################ -ldbrename_OBJ_FILES = lib/ldb/tools/ldbrename.o +ldbrename_OBJ_FILES = $(ldbdir)/tools/ldbrename.o MANPAGES += $(ldbdir)/man/ldbrename.1 diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index 44adc53524..fd1fd01a09 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -5,12 +5,11 @@ TDR_REGF_OBJ_FILES = $(libregistrysrcdir)/tdr_regf.o # Special support for external builddirs $(libregistrysrcdir)/regf.c: $(libregistrysrcdir)/tdr_regf.c -$(srcdir)/$(libregistrysrcdir)/regf.c: $(libregistrysrcdir)/tdr_regf.c $(libregistrysrcdir)/tdr_regf.h: $(libregistrysrcdir)/tdr_regf.c -$(libregistrysrcdir)/tdr_regf.c: $(srcdir)/$(libregistrysrcdir)/regf.idl - @CPP="$(CPP)" srcdir="$(srcdir)" $(PERL) $(srcdir)/pidl/pidl $(PIDL_ARGS) \ - --header --outputdir=lib/registry \ - --tdr-parser -- $(srcdir)/$(libregistrysrcdir)/regf.idl +$(libregistrysrcdir)/tdr_regf.c: $(libregistrysrcdir)/regf.idl + @CPP="$(CPP)" $(PERL) $(pidldir)/pidl $(PIDL_ARGS) \ + --header --outputdir=$(libregistrysrcdir) \ + --tdr-parser -- $(libregistrysrcdir)/regf.idl clean:: @-rm -f $(libregistrysrcdir)/regf.h $(libregistrysrcdir)/tdr_regf* diff --git a/source4/lib/smbreadline/readline.m4 b/source4/lib/smbreadline/readline.m4 index ab85bba438..ad6bc66690 100644 --- a/source4/lib/smbreadline/readline.m4 +++ b/source4/lib/smbreadline/readline.m4 @@ -79,10 +79,10 @@ AC_MSG_CHECKING(whether to use extern readline) if test x"$EXTERNAL_READLINE" = x"yes"; then AC_MSG_RESULT(yes) AC_DEFINE(HAVE_LIBREADLINE,1,[Whether the system has readline]) - SMB_SUBSYSTEM(SMBREADLINE, [lib/smbreadline/smbreadline.o], [READLINE]) + SMB_SUBSYSTEM(SMBREADLINE, [\$(smbreadlinesrcdir)/smbreadline.o], [READLINE]) SMB_EXT_LIB(READLINE, [${TERMLIBS}]) SMB_ENABLE(READLINE,YES) else - SMB_SUBSYSTEM(SMBREADLINE, [lib/smbreadline/smbreadline.o], []) + SMB_SUBSYSTEM(SMBREADLINE, [\$(smbreadlinesrcdir)/smbreadline.o], []) AC_MSG_RESULT(no) fi diff --git a/source4/lib/util/debug.c b/source4/lib/util/debug.c index 5c1abf5039..00dcbfc8bd 100644 --- a/source4/lib/util/debug.c +++ b/source4/lib/util/debug.c @@ -21,7 +21,7 @@ #include "includes.h" #include "system/filesys.h" #include "system/time.h" -#include "dynconfig.h" +#include "dynconfig/dynconfig.h" /** * @file diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk index b24f3eb4af..02711eedb3 100644 --- a/source4/libcli/config.mk +++ b/source4/libcli/config.mk @@ -61,15 +61,14 @@ $(eval $(call proto_header_template,$(libclisrcdir)/nbt/nbt_proto.h,$(LIBCLI_NBT PUBLIC_DEPENDENCIES = LIBNDR \ NDR_SECURITY -LIBCLI_NDR_NETLOGON_OBJ_FILES = $(addprefix libcli/, \ - ndr_netlogon.o) +LIBCLI_NDR_NETLOGON_OBJ_FILES = $(addprefix $(libclisrcdir)/, ndr_netlogon.o) $(eval $(call proto_header_template,$(libclisrcdir)/ndr_netlogon_proto.h,$(LIBCLI_NDR_NETLOGON_OBJ_FILES:.o=.c))) [SUBSYSTEM::LIBCLI_NETLOGON] PUBLIC_DEPENDENCIES = LIBSAMBA-UTIL LIBCLI_NDR_NETLOGON -LIBCLI_NETLOGON_OBJ_FILES = $(addprefix libcli/, \ +LIBCLI_NETLOGON_OBJ_FILES = $(addprefix $(libclisrcdir)/, \ netlogon.o) $(eval $(call proto_header_template,$(libclisrcdir)/netlogon_proto.h,$(LIBCLI_NETLOGON_OBJ_FILES:.o=.c))) diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index ab25921ef8..a39f50411b 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -350,7 +350,7 @@ NDR_WINBIND_OBJ_FILES = $(gen_ndrsrcdir)/ndr_winbind.o #PUBLIC_HEADERS += $(gen_ndrsrcdir)/winbind.h $(librpcsrcdir)/idl-deps: - ./$(librpcsrcdir)/idl-deps.pl $(librpcsrcdir)/idl/*.idl >$@ + $(PERL) $(librpcsrcdir)/idl-deps.pl $(librpcsrcdir)/idl/*.idl >$@ clean:: rm -f $(librpcsrcdir)/idl-deps diff --git a/source4/librpc/idl-deps.pl b/source4/librpc/idl-deps.pl index e630ee4f61..49fba4c935 100755 --- a/source4/librpc/idl-deps.pl +++ b/source4/librpc/idl-deps.pl @@ -4,8 +4,8 @@ use strict; my %vars = (); foreach(@ARGV) { - push (@{$vars{IDL_FILES}}, $_); my $b = $_; $b =~ s/.*\/(.*?).idl$/$1/; + push (@{$vars{IDL_FILES}}, "\$(librpcsrcdir)/idl/$b.idl"); push (@{$vars{IDL_HEADER_FILES}}, "\$(librpcsrcdir)/gen_ndr/$b.h"); push (@{$vars{IDL_NDR_PARSE_H_FILES}}, "\$(librpcsrcdir)/gen_ndr/ndr_$b.h"); push (@{$vars{IDL_NDR_PARSE_C_FILES}}, "\$(librpcsrcdir)/gen_ndr/ndr_$b.c"); diff --git a/source4/main.mk b/source4/main.mk index 90473cce93..4fd1502fae 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -1,95 +1,49 @@ -mkinclude dynconfig.mk -heimdalsrcdir := heimdal +mkinclude dynconfig/config.mk mkinclude heimdal_build/config.mk mkinclude config.mk -dsdbsrcdir := dsdb mkinclude dsdb/config.mk -smbdsrcdir := smbd mkinclude smbd/config.mk -clustersrcdir := cluster mkinclude cluster/config.mk mkinclude smbd/process_model.mk -libnetsrcdir := libnet mkinclude libnet/config.mk -authsrcdir := auth mkinclude auth/config.mk -nsswitchsrcdir := nsswitch mkinclude nsswitch/config.mk -libsrcdir := lib mkinclude lib/samba3/config.mk -libsocketsrcdir := lib/socket mkinclude lib/socket/config.mk -libcharsetsrcdir := lib/charset mkinclude lib/charset/config.mk -ldb_sambasrcdir := lib/ldb-samba mkinclude lib/ldb-samba/config.mk -libtlssrcdir := lib/tls mkinclude lib/tls/config.mk -libregistrysrcdir := lib/registry mkinclude lib/registry/config.mk -libmessagingsrcdir := lib/messaging mkinclude lib/messaging/config.mk -libeventssrcdir := lib/events mkinclude lib/events/config.mk -libcmdlinesrcdir := lib/cmdline mkinclude lib/cmdline/config.mk -socketwrappersrcdir := lib/socket_wrapper mkinclude lib/socket_wrapper/config.mk -nsswrappersrcdir := lib/nss_wrapper mkinclude lib/nss_wrapper/config.mk -appwebsrcdir := lib/appweb mkinclude lib/appweb/config.mk -libstreamsrcdir := lib/stream mkinclude lib/stream/config.mk -libutilsrcdir := lib/util mkinclude lib/util/config.mk -libtdrsrcdir := lib/tdr mkinclude lib/tdr/config.mk -libdbwrapsrcdir := lib/dbwrap mkinclude lib/dbwrap/config.mk -libcryptosrcdir := lib/crypto mkinclude lib/crypto/config.mk -libtorturesrcdir := lib/torture mkinclude lib/torture/config.mk -libcompressionsrcdir := lib/compression -libgencachesrcdir := lib mkinclude lib/basic.mk -paramsrcdir := param mkinclude param/config.mk -smb_serversrcdir := smb_server mkinclude smb_server/config.mk -rpc_serversrcdir := rpc_server mkinclude rpc_server/config.mk -ldap_serversrcdir := ldap_server mkinclude ldap_server/config.mk -web_serversrcdir := web_server mkinclude web_server/config.mk -winbindsrcdir := winbind mkinclude winbind/config.mk -nbt_serversrcdir := nbt_server mkinclude nbt_server/config.mk -wrepl_serversrcdir := wrepl_server mkinclude wrepl_server/config.mk -cldap_serversrcdir := cldap_server mkinclude cldap_server/config.mk -utilssrcdir := utils mkinclude utils/net/config.mk mkinclude utils/config.mk -ntvfssrcdir := ntvfs mkinclude ntvfs/config.mk -ntptrsrcdir := ntptr mkinclude ntptr/config.mk -torturesrcdir := torture mkinclude torture/config.mk -librpcsrcdir := librpc mkinclude librpc/config.mk -clientsrcdir := client mkinclude client/config.mk -libclisrcdir := libcli mkinclude libcli/config.mk -ejsscriptsrcdir := scripting/ejs mkinclude scripting/ejs/config.mk -pyscriptsrcdir := $(srcdir)/scripting/python mkinclude scripting/python/config.mk -kdcsrcdir := kdc mkinclude kdc/config.mk diff --git a/source4/nsswitch/wbinfo.c b/source4/nsswitch/wbinfo.c index 7ead27939e..21c178cc7b 100644 --- a/source4/nsswitch/wbinfo.c +++ b/source4/nsswitch/wbinfo.c @@ -27,7 +27,7 @@ #include "libcli/auth/libcli_auth.h" #include "libcli/security/security.h" #include "lib/cmdline/popt_common.h" -#include "dynconfig.h" +#include "dynconfig/dynconfig.h" #include "param/param.h" extern int winbindd_fd; diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk index bf34c4082a..593c526edb 100644 --- a/source4/ntvfs/config.mk +++ b/source4/ntvfs/config.mk @@ -27,7 +27,7 @@ PRIVATE_DEPENDENCIES = \ # End MODULE ntvfs_smb2 ################################################ -ntvfs_smb2_OBJ_FILES = ntvfs/smb2/vfs_smb2.o +ntvfs_smb2_OBJ_FILES = $(ntvfssrcdir)/smb2/vfs_smb2.o ################################################ diff --git a/source4/param/config.mk b/source4/param/config.mk index 02474d50b9..c169ce157e 100644 --- a/source4/param/config.mk +++ b/source4/param/config.mk @@ -6,7 +6,7 @@ LIBSAMBA-HOSTCONFIG_VERSION = 0.0.1 LIBSAMBA-HOSTCONFIG_SOVERSION = 0 LIBSAMBA-HOSTCONFIG_OBJ_FILES = $(addprefix $(paramsrcdir)/, \ - loadparm.o generic.o util.o) lib/version.o + loadparm.o generic.o util.o) PUBLIC_HEADERS += param/param.h diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 812162e170..b70e4c19f0 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -54,7 +54,7 @@ #include "includes.h" #include "version.h" -#include "dynconfig.h" +#include "dynconfig/dynconfig.h" #include "system/time.h" #include "system/locale.h" #include "system/network.h" /* needed for TCP_NODELAY */ diff --git a/source4/param/util.c b/source4/param/util.c index 2baaefda8b..15e3b4768c 100644 --- a/source4/param/util.c +++ b/source4/param/util.c @@ -23,7 +23,7 @@ */ #include "includes.h" -#include "dynconfig.h" +#include "dynconfig/dynconfig.h" #include "system/network.h" #include "system/filesys.h" #include "system/dir.h" diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c index 9ed4aa490f..db9fc9affa 100644 --- a/source4/scripting/ejs/smbscript.c +++ b/source4/scripting/ejs/smbscript.c @@ -26,7 +26,7 @@ #include "scripting/ejs/smbcalls.h" #include "auth/gensec/gensec.h" #include "ldb/include/ldb.h" -#include "dynconfig.h" +#include "dynconfig/dynconfig.h" static EjsId eid; diff --git a/source4/static_deps.mk b/source4/static_deps.mk index 7eb8fa10fe..085eae938d 100644 --- a/source4/static_deps.mk +++ b/source4/static_deps.mk @@ -1,42 +1,42 @@ # These should also be autogenerated at some point # perhaps by some perl scripts run from config.status ? # -librpc/gen_ndr/misc.h: idl -librpc/ndr/libndr.h: librpc/ndr/libndr_proto.h librpc/gen_ndr/misc.h -librpc/rpc/dcerpc.h: librpc/rpc/dcerpc_proto.h -auth/credentials/credentials.h: auth/credentials/credentials_proto.h -libcli/nbt/libnbt.h: libcli/nbt/nbt_proto.h -lib/charset/charset.h: lib/charset/charset_proto.h +$(gen_ndrsrcdir)/misc.h: idl +$(ndrsrcdir)/libndr.h: $(ndrsrcdir)/libndr_proto.h $(gen_ndrsrcdir)/misc.h +$(dcerpcsrcdir)/dcerpc.h: $(dcerpcsrcdir)/dcerpc_proto.h +$(authsrcdir)/credentials/credentials.h: $(authsrcdir)/credentials/credentials_proto.h +$(libclisrcdir)/nbt/libnbt.h: $(libclisrcdir)/nbt/nbt_proto.h +$(libcharsetsrcdir)/charset.h: $(libcharsetsrcdir)/charset_proto.h include/includes.h: \ include/config.h \ - lib/charset/charset.h \ - librpc/gen_ndr/misc.h + $(libcharsetsrcdir)/charset.h \ + $(gen_ndrsrcdir)/misc.h heimdal_basics: \ - heimdal/lib/hdb/hdb_asn1.h \ - heimdal/lib/gssapi/spnego_asn1.h \ - heimdal/lib/gssapi/gssapi_asn1.h \ - heimdal/lib/asn1/krb5_asn1.h \ - heimdal/lib/asn1/asn1_err.h \ - heimdal/lib/asn1/digest_asn1.h \ - heimdal/lib/asn1/pkcs8_asn1.h \ - heimdal/lib/asn1/pkcs9_asn1.h \ - heimdal/lib/asn1/pkcs12_asn1.h \ - heimdal/lib/asn1/cms_asn1.h \ - heimdal/lib/asn1/rfc2459_asn1.h \ - heimdal/lib/asn1/pkinit_asn1.h \ - heimdal/lib/asn1/kx509_asn1.h \ - heimdal/lib/hx509/ocsp_asn1.h \ - heimdal/lib/hx509/pkcs10_asn1.h \ - heimdal/lib/hdb/hdb_err.h \ - heimdal/lib/krb5/heim_err.h \ - heimdal/lib/krb5/k524_err.h \ - heimdal/lib/krb5/krb_err.h \ - heimdal/lib/krb5/krb5_err.h \ - heimdal/lib/gssapi/gkrb5_err.h \ - heimdal/lib/hx509/hx509_err.h \ - heimdal/lib/wind/wind_err.h + $(heimdalsrcdir)/lib/hdb/hdb_asn1.h \ + $(heimdalsrcdir)/lib/gssapi/spnego_asn1.h \ + $(heimdalsrcdir)/lib/gssapi/gssapi_asn1.h \ + $(heimdalsrcdir)/lib/asn1/krb5_asn1.h \ + $(heimdalsrcdir)/lib/asn1/asn1_err.h \ + $(heimdalsrcdir)/lib/asn1/digest_asn1.h \ + $(heimdalsrcdir)/lib/asn1/pkcs8_asn1.h \ + $(heimdalsrcdir)/lib/asn1/pkcs9_asn1.h \ + $(heimdalsrcdir)/lib/asn1/pkcs12_asn1.h \ + $(heimdalsrcdir)/lib/asn1/cms_asn1.h \ + $(heimdalsrcdir)/lib/asn1/rfc2459_asn1.h \ + $(heimdalsrcdir)/lib/asn1/pkinit_asn1.h \ + $(heimdalsrcdir)/lib/asn1/kx509_asn1.h \ + $(heimdalsrcdir)/lib/hx509/ocsp_asn1.h \ + $(heimdalsrcdir)/lib/hx509/pkcs10_asn1.h \ + $(heimdalsrcdir)/lib/hdb/hdb_err.h \ + $(heimdalsrcdir)/lib/krb5/heim_err.h \ + $(heimdalsrcdir)/lib/krb5/k524_err.h \ + $(heimdalsrcdir)/lib/krb5/krb_err.h \ + $(heimdalsrcdir)/lib/krb5/krb5_err.h \ + $(heimdalsrcdir)/lib/gssapi/gkrb5_err.h \ + $(heimdalsrcdir)/lib/hx509/hx509_err.h \ + $(heimdalsrcdir)/lib/wind/wind_err.h proto:: basics:: include/includes.h idl proto heimdal_basics diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c index cc9da417fe..068b6bdc2f 100644 --- a/source4/torture/gentest.c +++ b/source4/torture/gentest.c @@ -30,7 +30,7 @@ #include "libcli/resolve/resolve.h" #include "auth/gensec/gensec.h" #include "param/param.h" -#include "dynconfig.h" +#include "dynconfig/dynconfig.h" #define NSERVERS 2 #define NINSTANCES 2 diff --git a/source4/torture/gentest_smb2.c b/source4/torture/gentest_smb2.c index da099dbae2..60bf6264c2 100644 --- a/source4/torture/gentest_smb2.c +++ b/source4/torture/gentest_smb2.c @@ -34,7 +34,7 @@ #include "libcli/resolve/resolve.h" #include "auth/gensec/gensec.h" #include "param/param.h" -#include "dynconfig.h" +#include "dynconfig/dynconfig.h" #define NSERVERS 2 #define NINSTANCES 2 diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c index 8959232edb..4a0dfc2a6f 100644 --- a/source4/torture/locktest.c +++ b/source4/torture/locktest.c @@ -27,7 +27,7 @@ #include "auth/gensec/gensec.h" #include "libcli/libcli.h" #include "param/param.h" -#include "dynconfig.h" +#include "dynconfig/dynconfig.h" #include "libcli/resolve/resolve.h" static int numops = 1000; diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c index 39b1296dbe..255d94382c 100644 --- a/source4/torture/masktest.c +++ b/source4/torture/masktest.c @@ -28,7 +28,7 @@ #include "auth/credentials/credentials.h" #include "auth/gensec/gensec.h" #include "param/param.h" -#include "dynconfig.h" +#include "dynconfig/dynconfig.h" #include "libcli/resolve/resolve.h" #include "lib/events/events.h" diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index 44daa89e44..e1e84247b4 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -28,7 +28,7 @@ #include "libcli/libcli.h" #include "lib/ldb/include/ldb.h" #include "lib/events/events.h" -#include "dynconfig.h" +#include "dynconfig/dynconfig.h" #include "torture/smbtorture.h" #include "lib/util/dlinklist.h" |