r11244: Relative path names in .mk files
authorJelmer Vernooij <jelmer@samba.org>
Fri, 21 Oct 2005 16:29:54 +0000 (16:29 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:45:06 +0000 (13:45 -0500)
58 files changed:
source/auth/config.mk
source/auth/credentials/config.mk
source/auth/gensec/config.mk
source/auth/kerberos/config.mk
source/auth/ntlmssp/config.mk
source/build/smb_build/config_mk.pm
source/build/smb_build/output.pm
source/cldap_server/config.mk
source/client/config.mk
source/dsdb/config.mk
source/gtk/config.mk
source/heimdal_build/config.mk
source/kdc/config.mk
source/kdc/heimdal_config.mk
source/ldap_server/config.mk
source/lib/appweb/config.mk
source/lib/basic.mk
source/lib/charset/config.mk
source/lib/cmdline/config.mk
source/lib/com/config.mk
source/lib/events/config.mk
source/lib/ldb/config.mk
source/lib/messaging/config.mk
source/lib/popt/config.mk
source/lib/registry/config.mk
source/lib/replace/config.mk
source/lib/samba3/config.mk
source/lib/socket/config.mk
source/lib/socket_wrapper/config.mk
source/lib/talloc/config.mk
source/lib/tdb/config.mk
source/lib/tls/config.mk
source/libcli/auth/config.mk
source/libcli/config.mk
source/libcli/ldap/config.mk
source/libcli/security/config.mk
source/libnet/config.mk
source/librpc/config.mk
source/main.mk
source/nbt_server/config.mk
source/nsswitch/config.mk
source/ntptr/config.mk
source/ntvfs/config.mk
source/ntvfs/posix/config.mk
source/ntvfs/unixuid/config.mk
source/param/config.mk
source/rpc_server/config.mk
source/scripting/config.mk
source/scripting/ejs/config.mk
source/smb_server/config.mk
source/smbd/config.mk
source/smbd/process_model.mk
source/torture/config.mk
source/utils/config.mk
source/utils/net/config.mk
source/web_server/config.mk
source/winbind/config.mk
source/wrepl_server/config.mk

index 7e7d4f026d705f0b7c4fb404e1c50612485db02a..5c5ec02c93a3858a23e12664b5c069b5339bf26b 100644 (file)
@@ -1,4 +1,8 @@
 # AUTH Server subsystem
+include gensec/config.mk
+include kerberos/config.mk
+include ntlmssp/config.mk
+include credentials/config.mk
 
 #######################
 # Start MODULE auth_sam
@@ -6,7 +10,7 @@
 INIT_FUNCTION = auth_sam_init
 SUBSYSTEM = AUTH
 INIT_OBJ_FILES = \
-               auth/auth_sam.o
+               auth_sam.o
 REQUIRED_SUBSYSTEMS = \
                SAMDB
 # End MODULE auth_sam
@@ -18,7 +22,7 @@ REQUIRED_SUBSYSTEMS = \
 INIT_FUNCTION = auth_anonymous_init
 SUBSYSTEM = AUTH
 INIT_OBJ_FILES = \
-               auth/auth_anonymous.o
+               auth_anonymous.o
 # End MODULE auth_anonymous
 #######################
 
@@ -28,7 +32,7 @@ INIT_OBJ_FILES = \
 INIT_FUNCTION = auth_winbind_init
 SUBSYSTEM = AUTH
 INIT_OBJ_FILES = \
-               auth/auth_winbind.o
+               auth_winbind.o
 REQUIRED_SUBSYSTEMS = \
                LIB_WINBIND_CLIENT \
                NDR_NETLOGON NDR_RAW
@@ -41,7 +45,7 @@ REQUIRED_SUBSYSTEMS = \
 INIT_FUNCTION = auth_domain_init
 SUBSYSTEM = AUTH
 INIT_OBJ_FILES = \
-               auth/auth_domain.o
+               auth_domain.o
 REQUIRED_SUBSYSTEMS = \
                NDR_NETLOGON NDR_RAW
 # End MODULE auth_winbind
@@ -53,7 +57,7 @@ REQUIRED_SUBSYSTEMS = \
 INIT_FUNCTION = auth_developer_init
 SUBSYSTEM = AUTH
 INIT_OBJ_FILES = \
-               auth/auth_developer.o
+               auth_developer.o
 # End MODULE auth_developer
 #######################
 
@@ -63,23 +67,23 @@ INIT_OBJ_FILES = \
 INIT_FUNCTION = auth_unix_init
 SUBSYSTEM = AUTH
 INIT_OBJ_FILES = \
-               auth/auth_unix.o
+               auth_unix.o
 REQUIRED_SUBSYSTEMS = \
                EXT_LIB_CRYPT EXT_LIB_PAM PAM_ERRORS
 # End MODULE auth_unix
 #######################
 
 [SUBSYSTEM::PAM_ERRORS]
-OBJ_FILES = auth/pam_errors.o
+OBJ_FILES = pam_errors.o
 
 #######################
 # Start SUBSYSTEM AUTH
 [SUBSYSTEM::AUTH]
 INIT_OBJ_FILES = \
-               auth/auth.o
+               auth.o
 ADD_OBJ_FILES = \
-               auth/auth_util.o \
-               auth/auth_sam_reply.o \
-               auth/ntlm_check.o
+               auth_util.o \
+               auth_sam_reply.o \
+               ntlm_check.o
 # End SUBSYSTEM AUTH
 #######################
index 74f3f07bef8c038476b2da409ed618f796d016a4..5e3299784eebcb096ac9921ea8d769e9aa7fb676 100644 (file)
@@ -1,10 +1,10 @@
 #################################
 # Start SUBSYSTEM GENSEC
 [SUBSYSTEM::CREDENTIALS]
-INIT_OBJ_FILES = auth/credentials/credentials.o
-ADD_OBJ_FILES = auth/credentials/credentials_files.o \
-               auth/credentials/credentials_krb5.o \
-               auth/credentials/credentials_ntlm.o
+INIT_OBJ_FILES = credentials.o
+ADD_OBJ_FILES = credentials_files.o \
+               credentials_krb5.o \
+               credentials_ntlm.o
 REQUIRED_SUBSYSTEMS = \
                HEIMDAL
 # End SUBSYSTEM GENSEC
index 03f7f24848bf05160f2dae5022156c10798f110e..fe4a5e48e16a73e48b20a51359ee09b520e50563 100644 (file)
@@ -2,7 +2,7 @@
 # Start SUBSYSTEM GENSEC
 [SUBSYSTEM::GENSEC]
 INIT_FUNCTION = gensec_init
-INIT_OBJ_FILES = auth/gensec/gensec.o
+INIT_OBJ_FILES = gensec.o
 REQUIRED_SUBSYSTEMS = \
                SCHANNELDB
 # End SUBSYSTEM GENSEC
@@ -13,7 +13,7 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::gensec_krb5]
 SUBSYSTEM = GENSEC
 INIT_FUNCTION = gensec_krb5_init
-INIT_OBJ_FILES = auth/gensec/gensec_krb5.o 
+INIT_OBJ_FILES = gensec_krb5.o 
 REQUIRED_SUBSYSTEMS = KERBEROS AUTH
 # End MODULE gensec_krb5
 ################################################
@@ -23,7 +23,7 @@ REQUIRED_SUBSYSTEMS = KERBEROS AUTH
 [MODULE::gensec_gssapi]
 SUBSYSTEM = GENSEC
 INIT_FUNCTION = gensec_gssapi_init
-INIT_OBJ_FILES = auth/gensec/gensec_gssapi.o 
+INIT_OBJ_FILES = gensec_gssapi.o 
 REQUIRED_SUBSYSTEMS = KERBEROS AUTH
 # End MODULE gensec_gssapi
 ################################################
@@ -33,9 +33,9 @@ REQUIRED_SUBSYSTEMS = KERBEROS AUTH
 [MODULE::gensec_spnego]
 SUBSYSTEM = GENSEC
 INIT_FUNCTION = gensec_spnego_init
-INIT_OBJ_FILES = auth/gensec/spnego.o
+INIT_OBJ_FILES = spnego.o
 ADD_OBJ_FILES = \
-               auth/gensec/spnego_parse.o
+               spnego_parse.o
 # End MODULE gensec_spnego
 ################################################
 
@@ -44,9 +44,9 @@ ADD_OBJ_FILES = \
 [MODULE::gensec_schannel]
 SUBSYSTEM = GENSEC
 INIT_FUNCTION = gensec_schannel_init
-INIT_OBJ_FILES = auth/gensec/schannel.o
+INIT_OBJ_FILES = schannel.o
 ADD_OBJ_FILES = \
-               auth/gensec/schannel_sign.o
+               schannel_sign.o
 REQUIRED_SUBSYSTEMS = AUTH SCHANNELDB
 # End MODULE gensec_schannel
 ################################################
@@ -55,7 +55,7 @@ REQUIRED_SUBSYSTEMS = AUTH SCHANNELDB
 # Start SUBSYSTEM SCHANNELDB
 [SUBSYSTEM::SCHANNELDB]
 INIT_OBJ_FILES = \
-               auth/gensec/schannel_state.o
+               schannel_state.o
 #
 # End SUBSYSTEM SCHANNELDB
 ################################################
index cc31af44e7ab4c9b37e0f1d1adfd96df0edab576..d3b1a6b0dc5105421297f915a20c9f3fc336bec1 100644 (file)
@@ -1,14 +1,14 @@
 #################################
 # Start SUBSYSTEM KERBEROS
 [SUBSYSTEM::KERBEROS]
-INIT_OBJ_FILES = auth/kerberos/kerberos.o 
+INIT_OBJ_FILES = kerberos.o 
 ADD_OBJ_FILES = \
-               auth/kerberos/clikrb5.o \
-               auth/kerberos/kerberos_verify.o \
-               auth/kerberos/kerberos_util.o \
-               auth/kerberos/kerberos_pac.o \
-               auth/kerberos/gssapi_parse.o \
-               auth/kerberos/krb5_init_context.o
+               clikrb5.o \
+               kerberos_verify.o \
+               kerberos_util.o \
+               kerberos_pac.o \
+               gssapi_parse.o \
+               krb5_init_context.o
 REQUIRED_SUBSYSTEMS = KERBEROS_LIB NDR_KRB5PAC 
 # End SUBSYSTEM KERBEROS
 #################################
index 551c211d71fd7f1d9f3af3da68c0ff037babc5f2..b4df62872cb87afe3f985cd84faff8af92f76e84 100644 (file)
@@ -3,12 +3,12 @@
 [MODULE::gensec_ntlmssp]
 SUBSYSTEM = GENSEC
 INIT_FUNCTION = gensec_ntlmssp_init
-INIT_OBJ_FILES = auth/ntlmssp/ntlmssp.o
+INIT_OBJ_FILES = ntlmssp.o
 ADD_OBJ_FILES = \
-               auth/ntlmssp/ntlmssp_parse.o \
-               auth/ntlmssp/ntlmssp_sign.o \
-               auth/ntlmssp/ntlmssp_client.o \
-               auth/ntlmssp/ntlmssp_server.o
+               ntlmssp_parse.o \
+               ntlmssp_sign.o \
+               ntlmssp_client.o \
+               ntlmssp_server.o
 REQUIRED_SUBSYSTEMS = AUTH
 # End MODULE gensec_ntlmssp
 ################################################
index e5c8c293aa350c033b34a0eaf441a365c7f6a17e..b26e70f88b7b0781d2018e2636fb5830a5fcb6e8 100644 (file)
@@ -8,6 +8,7 @@
 
 package smb_build::config_mk;
 use smb_build::input;
+use File::Basename;
 
 use strict;
 
@@ -131,7 +132,7 @@ sub run_config_mk($$)
 
                # include
                if ($line =~ /^include (.*)$/) {
-                       $makefile .= run_config_mk($input, $1);
+                       $makefile .= run_config_mk($input, dirname($filename)."/$1");
                        next;
                }
 
@@ -171,6 +172,7 @@ sub run_config_mk($$)
 
                $input->{$name}{NAME} = $name;
                $input->{$name}{TYPE} = $type;
+               $input->{$name}{BASEDIR} = dirname($filename);
 
                foreach my $key (values %{$result->{$section}}) {
                        $key->{VAL} = smb_build::input::strtrim($key->{VAL});
index f6c4a78274c8e161d90043879ccd9ca7dee5236b..46e8ffb0c5f817f1bb89ba120865ada41a9b57eb 100644 (file)
 package output;
 use strict;
 
+sub add_dir($$)
+{
+       my ($dir,$files) = @_;
+       my @ret = ();
+       
+       foreach (@$files) {
+               $_ = "$dir/$_";
+               s/\/\//\//g;
+               s/\/([^\/\.]+)\/\.\.\//\//g;
+               push (@ret, $_);
+       }
+       
+       return @ret;
+}
+
 sub generate_mergedobj($)
 {
        my $subsys = shift;
@@ -93,9 +108,9 @@ sub create_output($)
                next if not defined($part->{OUTPUT_TYPE});
 
                # Combine object lists
-               push(@{$part->{OBJ_LIST}}, @{$part->{INIT_OBJ_FILES}}) if defined($part->{INIT_OBJ_FILES});
-               push(@{$part->{OBJ_LIST}}, @{$part->{ADD_OBJ_FILES}}) if defined($part->{ADD_OBJ_FILES});
-               push(@{$part->{OBJ_LIST}}, @{$part->{OBJ_FILES}}) if defined($part->{OBJ_FILES});
+               push(@{$part->{OBJ_LIST}}, add_dir($part->{BASEDIR}, $part->{INIT_OBJ_FILES})) if defined($part->{INIT_OBJ_FILES});
+               push(@{$part->{OBJ_LIST}}, add_dir($part->{BASEDIR}, $part->{ADD_OBJ_FILES})) if defined($part->{ADD_OBJ_FILES});
+               push(@{$part->{OBJ_LIST}}, add_dir($part->{BASEDIR}, $part->{OBJ_FILES})) if defined($part->{OBJ_FILES});
 
                if ((not defined($part->{OBJ_LIST}) or 
                        scalar(@{$part->{OBJ_LIST}}) == 0) and 
index a2042cecc5c10f7d54f08b05297910d325866c36..bd62667b913125bbf889d3c012a1c26404577aa1 100644 (file)
@@ -4,9 +4,9 @@
 # Start SUBSYSTEM CLDAPD
 [SUBSYSTEM::CLDAPD]
 INIT_OBJ_FILES = \
-               cldap_server/cldap_server.o
+               cldap_server.o
 ADD_OBJ_FILES = \
-               cldap_server/netlogon.o
+               netlogon.o
 REQUIRED_SUBSYSTEMS = \
                LIBCLI_CLDAP
 # End SUBSYSTEM CLDAPD
index 1a500593edfb5b8f71dde5b4d27ee47af69482e6..f263edf8d1b6eb2d509f5b3ebe21de8b53c55504 100644 (file)
@@ -5,7 +5,7 @@
 [BINARY::smbclient]
 INSTALLDIR = BINDIR
 OBJ_FILES = \
-               client/client.o
+               client.o
 REQUIRED_SUBSYSTEMS = \
                CONFIG \
                LIBCMDLINE \
index e1d5a39c0e0553b56067170e8c97104c5bc294b6..59178c3cda52f1f7c3892ca2a9beef6a3d878b08 100644 (file)
@@ -5,7 +5,7 @@
 [MODULE::libldb_objectguid]
 SUBSYSTEM = LIBLDB
 INIT_OBJ_FILES = \
-               dsdb/samdb/ldb_modules/objectguid.o
+               samdb/ldb_modules/objectguid.o
 REQUIRED_SUBSYSTEMS = \
                NDR_RAW NDR_MISC
 # End MODULE libldb_objectguid
@@ -16,7 +16,7 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::libldb_samldb]
 SUBSYSTEM = LIBLDB
 INIT_OBJ_FILES = \
-               dsdb/samdb/ldb_modules/samldb.o
+               samdb/ldb_modules/samldb.o
 #
 # End MODULE libldb_samldb
 ################################################
@@ -26,7 +26,7 @@ INIT_OBJ_FILES = \
 [MODULE::libldb_samba3sam]
 SUBSYSTEM = LIBLDB
 INIT_OBJ_FILES = \
-               dsdb/samdb/ldb_modules/samba3sam.o
+               samdb/ldb_modules/samba3sam.o
 #
 # End MODULE libldb_samldb
 ################################################
@@ -36,7 +36,7 @@ INIT_OBJ_FILES = \
 [MODULE::libldb_proxy]
 SUBSYSTEM = LIBLDB
 INIT_OBJ_FILES = \
-               dsdb/samdb/ldb_modules/proxy.o
+               samdb/ldb_modules/proxy.o
 #
 # End MODULE libldb_proxy
 ################################################
@@ -45,10 +45,10 @@ INIT_OBJ_FILES = \
 # Start SUBSYSTEM SAMDB
 [SUBSYSTEM::SAMDB]
 INIT_OBJ_FILES = \
-               dsdb/samdb/samdb.o
+               samdb/samdb.o
 ADD_OBJ_FILES = \
-               dsdb/samdb/samdb_privilege.o \
-               dsdb/common/flag_mapping.o
+               samdb/samdb_privilege.o \
+               common/flag_mapping.o
 REQUIRED_SUBSYSTEMS = \
                DCERPC_COMMON
 #
index 3b04442da8cfc2b64519f1d57e602ac6289bbe7b..09c53e1a4d88aba553b4535023ee66ba14f72b04 100644 (file)
@@ -4,10 +4,10 @@
 # Start SUBSYSTEM GTKSMB
 [SUBSYSTEM::GTKSMB]
 NOPROTO = YES
-INIT_OBJ_FILES = gtk/common/gtk-smb.o 
-ADD_OBJ_FILES = gtk/common/select.o \
-               gtk/common/gtk_events.o \
-               gtk/common/credentials.o
+INIT_OBJ_FILES = common/gtk-smb.o 
+ADD_OBJ_FILES = common/select.o \
+               common/gtk_events.o \
+               common/credentials.o
 REQUIRED_SUBSYSTEMS = CHARSET LIBBASIC EXT_LIB_gtk RPC_NDR_SAMR
 # End SUBSYSTEM GTKSMB
 ##############################
@@ -16,9 +16,9 @@ REQUIRED_SUBSYSTEMS = CHARSET LIBBASIC EXT_LIB_gtk RPC_NDR_SAMR
 # Start BINARY gregedit
 [BINARY::gregedit]
 INSTALLDIR = BINDIR
-OBJ_FILES = gtk/tools/gregedit.o
+OBJ_FILES = tools/gregedit.o
 REQUIRED_SUBSYSTEMS = CONFIG LIBCMDLINE REGISTRY GTKSMB
-MANPAGE = gtk/man/gregedit.1
+MANPAGE = man/gregedit.1
 # End BINARY gregedit
 ################################################
 
@@ -26,7 +26,7 @@ MANPAGE = gtk/man/gregedit.1
 # Start BINARY gepdump 
 [BINARY::gepdump]
 INSTALLDIR = BINDIR
-OBJ_FILES = gtk/tools/gepdump.o
+OBJ_FILES = tools/gepdump.o
 REQUIRED_SUBSYSTEMS = CONFIG LIBCMDLINE GTKSMB RPC_NDR_EPMAPPER RPC_NDR_MGMT
 # End BINARY gepdump 
 ################################################
@@ -35,7 +35,7 @@ REQUIRED_SUBSYSTEMS = CONFIG LIBCMDLINE GTKSMB RPC_NDR_EPMAPPER RPC_NDR_MGMT
 # Start BINARY gwcrontab
 [BINARY::gwcrontab]
 INSTALLDIR = BINDIR
-OBJ_FILES = gtk/tools/gwcrontab.o
+OBJ_FILES = tools/gwcrontab.o
 REQUIRED_SUBSYSTEMS = CONFIG LIBCMDLINE GTKSMB RPC_NDR_ATSVC
 # End BINARY gwcrontab
 ################################################
@@ -44,7 +44,7 @@ REQUIRED_SUBSYSTEMS = CONFIG LIBCMDLINE GTKSMB RPC_NDR_ATSVC
 # Start BINARY gwsam
 [BINARY::gwsam]
 INSTALLDIR = BINDIR
-OBJ_FILES = gtk/tools/gwsam.o gtk/tools/gwsam_user.o
+OBJ_FILES = tools/gwsam.o tools/gwsam_user.o
 REQUIRED_SUBSYSTEMS = CONFIG LIBCMDLINE RPC_NDR_SAMR GTKSMB
 # End BINARY gwsam
 ################################################
index b9351f58a38764455fa8e8b1b5bdfb058d624fa9..f90cb4ce5224396ff924ff48e9919b92c68f3f9e 100644 (file)
@@ -2,15 +2,15 @@
 # Start SUBSYSTEM HEIMDAL_KDC
 [SUBSYSTEM::HEIMDAL_KDC]
 ADD_OBJ_FILES = \
-       heimdal/kdc/default_config.o \
-       heimdal/kdc/kerberos5.o \
-       heimdal/kdc/pkinit.o \
-       heimdal/kdc/log.o \
-       heimdal/kdc/misc.o \
-       heimdal/kdc/524.o \
-       heimdal/kdc/kerberos4.o \
-       heimdal/kdc/kaserver.o \
-       heimdal/kdc/process.o
+       ../heimdal/kdc/default_config.o \
+       ../heimdal/kdc/kerberos5.o \
+       ../heimdal/kdc/pkinit.o \
+       ../heimdal/kdc/log.o \
+       ../heimdal/kdc/misc.o \
+       ../heimdal/kdc/524.o \
+       ../heimdal/kdc/kerberos4.o \
+       ../heimdal/kdc/kaserver.o \
+       ../heimdal/kdc/process.o
 NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_KDC
 #######################
@@ -19,27 +19,27 @@ NOPROTO = YES
 # Start SUBSYSTEM HEIMDAL_HDB
 [SUBSYSTEM::HEIMDAL_HDB]
 ADD_OBJ_FILES = \
-       heimdal/lib/hdb/db.o \
-       heimdal/lib/hdb/hdb.o \
-       heimdal/lib/hdb/ext.o \
-       heimdal/lib/hdb/keys.o \
-       heimdal/lib/hdb/mkey.o \
-       heimdal/lib/hdb/ndbm.o \
-       heimdal/lib/hdb/asn1_Event.o \
-       heimdal/lib/hdb/asn1_GENERATION.o \
-       heimdal/lib/hdb/asn1_HDBFlags.o \
-       heimdal/lib/hdb/asn1_HDB_Ext_Aliases.o \
-       heimdal/lib/hdb/asn1_HDB_Ext_Constrained_delegation_acl.o \
-       heimdal/lib/hdb/asn1_HDB_Ext_Lan_Manager_OWF.o \
-       heimdal/lib/hdb/asn1_HDB_Ext_PKINIT_acl.o \
-       heimdal/lib/hdb/asn1_HDB_Ext_PKINIT_certificate.o \
-       heimdal/lib/hdb/asn1_HDB_Ext_Password.o \
-       heimdal/lib/hdb/asn1_HDB_extension.o \
-       heimdal/lib/hdb/asn1_HDB_extensions.o \
-       heimdal/lib/hdb/asn1_Key.o \
-       heimdal/lib/hdb/asn1_Salt.o \
-       heimdal/lib/hdb/asn1_hdb_entry.o \
-       heimdal/lib/hdb/hdb_err.o
+       ../heimdal/lib/hdb/db.o \
+       ../heimdal/lib/hdb/hdb.o \
+       ../heimdal/lib/hdb/ext.o \
+       ../heimdal/lib/hdb/keys.o \
+       ../heimdal/lib/hdb/mkey.o \
+       ../heimdal/lib/hdb/ndbm.o \
+       ../heimdal/lib/hdb/asn1_Event.o \
+       ../heimdal/lib/hdb/asn1_GENERATION.o \
+       ../heimdal/lib/hdb/asn1_HDBFlags.o \
+       ../heimdal/lib/hdb/asn1_HDB_Ext_Aliases.o \
+       ../heimdal/lib/hdb/asn1_HDB_Ext_Constrained_delegation_acl.o \
+       ../heimdal/lib/hdb/asn1_HDB_Ext_Lan_Manager_OWF.o \
+       ../heimdal/lib/hdb/asn1_HDB_Ext_PKINIT_acl.o \
+       ../heimdal/lib/hdb/asn1_HDB_Ext_PKINIT_certificate.o \
+       ../heimdal/lib/hdb/asn1_HDB_Ext_Password.o \
+       ../heimdal/lib/hdb/asn1_HDB_extension.o \
+       ../heimdal/lib/hdb/asn1_HDB_extensions.o \
+       ../heimdal/lib/hdb/asn1_Key.o \
+       ../heimdal/lib/hdb/asn1_Salt.o \
+       ../heimdal/lib/hdb/asn1_hdb_entry.o \
+       ../heimdal/lib/hdb/hdb_err.o
 NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_HDB
 #######################
@@ -48,45 +48,45 @@ NOPROTO = YES
 # Start SUBSYSTEM HEIMDAL_GSSAPI
 [SUBSYSTEM::HEIMDAL_GSSAPI]
 ADD_OBJ_FILES = \
-       heimdal/lib/gssapi/init_sec_context.o \
-       heimdal/lib/gssapi/inquire_cred.o \
-       heimdal/lib/gssapi/release_buffer.o \
-       heimdal/lib/gssapi/release_cred.o \
-       heimdal/lib/gssapi/release_name.o \
-       heimdal/lib/gssapi/release_oid_set.o \
-       heimdal/lib/gssapi/sequence.o \
-       heimdal/lib/gssapi/test_oid_set_member.o \
-       heimdal/lib/gssapi/unwrap.o \
-       heimdal/lib/gssapi/verify_mic.o \
-       heimdal/lib/gssapi/wrap.o \
-       heimdal/lib/gssapi/address_to_krb5addr.o \
-       heimdal/lib/gssapi/asn1_ContextFlags.o \
-       heimdal/lib/gssapi/asn1_MechType.o \
-       heimdal/lib/gssapi/asn1_MechTypeList.o \
-       heimdal/lib/gssapi/asn1_NegotiationToken.o \
-       heimdal/lib/gssapi/asn1_NegTokenInit.o \
-       heimdal/lib/gssapi/asn1_NegTokenTarg.o \
-       heimdal/lib/gssapi/8003.o \
-       heimdal/lib/gssapi/accept_sec_context.o \
-       heimdal/lib/gssapi/acquire_cred.o \
-       heimdal/lib/gssapi/add_oid_set_member.o \
-       heimdal/lib/gssapi/arcfour.o \
-       heimdal/lib/gssapi/ccache_name.o \
-       heimdal/lib/gssapi/copy_ccache.o \
-       heimdal/lib/gssapi/cfx.o \
-       heimdal/lib/gssapi/compat.o \
-       heimdal/lib/gssapi/context_time.o \
-       heimdal/lib/gssapi/create_emtpy_oid_set.o \
-       heimdal/lib/gssapi/decapsulate.o \
-       heimdal/lib/gssapi/delete_sec_context.o \
-       heimdal/lib/gssapi/display_name.o \
-       heimdal/lib/gssapi/display_status.o \
-       heimdal/lib/gssapi/duplicate_name.o \
-       heimdal/lib/gssapi/encapsulate.o \
-       heimdal/lib/gssapi/external.o \
-       heimdal/lib/gssapi/get_mic.o \
-       heimdal/lib/gssapi/import_name.o \
-       heimdal/lib/gssapi/init.o
+       ../heimdal/lib/gssapi/init_sec_context.o \
+       ../heimdal/lib/gssapi/inquire_cred.o \
+       ../heimdal/lib/gssapi/release_buffer.o \
+       ../heimdal/lib/gssapi/release_cred.o \
+       ../heimdal/lib/gssapi/release_name.o \
+       ../heimdal/lib/gssapi/release_oid_set.o \
+       ../heimdal/lib/gssapi/sequence.o \
+       ../heimdal/lib/gssapi/test_oid_set_member.o \
+       ../heimdal/lib/gssapi/unwrap.o \
+       ../heimdal/lib/gssapi/verify_mic.o \
+       ../heimdal/lib/gssapi/wrap.o \
+       ../heimdal/lib/gssapi/address_to_krb5addr.o \
+       ../heimdal/lib/gssapi/asn1_ContextFlags.o \
+       ../heimdal/lib/gssapi/asn1_MechType.o \
+       ../heimdal/lib/gssapi/asn1_MechTypeList.o \
+       ../heimdal/lib/gssapi/asn1_NegotiationToken.o \
+       ../heimdal/lib/gssapi/asn1_NegTokenInit.o \
+       ../heimdal/lib/gssapi/asn1_NegTokenTarg.o \
+       ../heimdal/lib/gssapi/8003.o \
+       ../heimdal/lib/gssapi/accept_sec_context.o \
+       ../heimdal/lib/gssapi/acquire_cred.o \
+       ../heimdal/lib/gssapi/add_oid_set_member.o \
+       ../heimdal/lib/gssapi/arcfour.o \
+       ../heimdal/lib/gssapi/ccache_name.o \
+       ../heimdal/lib/gssapi/copy_ccache.o \
+       ../heimdal/lib/gssapi/cfx.o \
+       ../heimdal/lib/gssapi/compat.o \
+       ../heimdal/lib/gssapi/context_time.o \
+       ../heimdal/lib/gssapi/create_emtpy_oid_set.o \
+       ../heimdal/lib/gssapi/decapsulate.o \
+       ../heimdal/lib/gssapi/delete_sec_context.o \
+       ../heimdal/lib/gssapi/display_name.o \
+       ../heimdal/lib/gssapi/display_status.o \
+       ../heimdal/lib/gssapi/duplicate_name.o \
+       ../heimdal/lib/gssapi/encapsulate.o \
+       ../heimdal/lib/gssapi/external.o \
+       ../heimdal/lib/gssapi/get_mic.o \
+       ../heimdal/lib/gssapi/import_name.o \
+       ../heimdal/lib/gssapi/init.o
 NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_GSSAPI
 #######################
@@ -95,87 +95,87 @@ NOPROTO = YES
 # Start SUBSYSTEM HEIMDAL_KRB5
 [SUBSYSTEM::HEIMDAL_KRB5]
 ADD_OBJ_FILES = \
-       heimdal/lib/krb5/acache.o \
-       heimdal/lib/krb5/add_et_list.o \
-       heimdal/lib/krb5/addr_families.o \
-       heimdal/lib/krb5/appdefault.o \
-       heimdal/lib/krb5/asn1_glue.o \
-       heimdal/lib/krb5/auth_context.o \
-       heimdal/lib/krb5/build_ap_req.o \
-       heimdal/lib/krb5/build_auth.o \
-       heimdal/lib/krb5/cache.o \
-       heimdal/lib/krb5/changepw.o \
-       heimdal/lib/krb5/codec.o \
-       heimdal/lib/krb5/config_file.o \
-       heimdal/lib/krb5/config_file_netinfo.o \
-       heimdal/lib/krb5/constants.o \
-       heimdal/lib/krb5/context.o \
-       heimdal/lib/krb5/copy_host_realm.o \
-       heimdal/lib/krb5/crc.o \
-       heimdal/lib/krb5/creds.o \
-       heimdal/lib/krb5/crypto.o \
-       heimdal/lib/krb5/data.o \
-       heimdal/lib/krb5/eai_to_heim_errno.o \
-       heimdal/lib/krb5/error_string.o \
-       heimdal/lib/krb5/expand_hostname.o \
-       heimdal/lib/krb5/fcache.o \
-       heimdal/lib/krb5/free.o \
-       heimdal/lib/krb5/free_host_realm.o \
-       heimdal/lib/krb5/generate_seq_number.o \
-       heimdal/lib/krb5/generate_subkey.o \
-       heimdal/lib/krb5/get_cred.o \
-       heimdal/lib/krb5/get_default_principal.o \
-       heimdal/lib/krb5/get_default_realm.o \
-       heimdal/lib/krb5/get_for_creds.o \
-       heimdal/lib/krb5/get_host_realm.o \
-       heimdal/lib/krb5/get_in_tkt.o \
-       heimdal/lib/krb5/get_in_tkt_with_keytab.o \
-       heimdal/lib/krb5/get_port.o \
-       heimdal/lib/krb5/init_creds.o \
-       heimdal/lib/krb5/init_creds_pw.o \
-       heimdal/lib/krb5/kcm.o \
-       heimdal/lib/krb5/keyblock.o \
-       heimdal/lib/krb5/keytab.o \
-       heimdal/lib/krb5/keytab_any.o \
-       heimdal/lib/krb5/keytab_file.o \
-       heimdal/lib/krb5/keytab_memory.o \
-       heimdal/lib/krb5/keytab_keyfile.o \
-       heimdal/lib/krb5/keytab_krb4.o \
-       heimdal/lib/krb5/krbhst.o \
-       heimdal/lib/krb5/log.o \
-       heimdal/lib/krb5/mcache.o \
-       heimdal/lib/krb5/misc.o \
-       heimdal/lib/krb5/mk_error.o \
-       heimdal/lib/krb5/mk_priv.o \
-       heimdal/lib/krb5/mk_rep.o \
-       heimdal/lib/krb5/mk_req.o \
-       heimdal/lib/krb5/mk_req_ext.o \
-       heimdal/lib/krb5/mit_glue.o \
-       heimdal/lib/krb5/n-fold.o \
-       heimdal/lib/krb5/padata.o \
-       heimdal/lib/krb5/pkinit.o \
-       heimdal/lib/krb5/principal.o \
-       heimdal/lib/krb5/rd_cred.o \
-       heimdal/lib/krb5/rd_error.o \
-       heimdal/lib/krb5/rd_priv.o \
-       heimdal/lib/krb5/rd_rep.o \
-       heimdal/lib/krb5/rd_req.o \
-       heimdal/lib/krb5/replay.o \
-       heimdal/lib/krb5/send_to_kdc.o \
-       heimdal/lib/krb5/set_default_realm.o \
-       heimdal/lib/krb5/store.o \
-       heimdal/lib/krb5/store_emem.o \
-       heimdal/lib/krb5/store_fd.o \
-       heimdal/lib/krb5/store_mem.o \
-       heimdal/lib/krb5/ticket.o \
-       heimdal/lib/krb5/time.o \
-       heimdal/lib/krb5/transited.o \
-       heimdal/lib/krb5/v4_glue.o \
-       heimdal/lib/krb5/version.o \
-       heimdal/lib/krb5/warn.o \
-       heimdal/lib/krb5/krb5_err.o \
-       heimdal/lib/krb5/heim_err.o \
-       heimdal/lib/krb5/k524_err.o
+       ../heimdal/lib/krb5/acache.o \
+       ../heimdal/lib/krb5/add_et_list.o \
+       ../heimdal/lib/krb5/addr_families.o \
+       ../heimdal/lib/krb5/appdefault.o \
+       ../heimdal/lib/krb5/asn1_glue.o \
+       ../heimdal/lib/krb5/auth_context.o \
+       ../heimdal/lib/krb5/build_ap_req.o \
+       ../heimdal/lib/krb5/build_auth.o \
+       ../heimdal/lib/krb5/cache.o \
+       ../heimdal/lib/krb5/changepw.o \
+       ../heimdal/lib/krb5/codec.o \
+       ../heimdal/lib/krb5/config_file.o \
+       ../heimdal/lib/krb5/config_file_netinfo.o \
+       ../heimdal/lib/krb5/constants.o \
+       ../heimdal/lib/krb5/context.o \
+       ../heimdal/lib/krb5/copy_host_realm.o \
+       ../heimdal/lib/krb5/crc.o \
+       ../heimdal/lib/krb5/creds.o \
+       ../heimdal/lib/krb5/crypto.o \
+       ../heimdal/lib/krb5/data.o \
+       ../heimdal/lib/krb5/eai_to_heim_errno.o \
+       ../heimdal/lib/krb5/error_string.o \
+       ../heimdal/lib/krb5/expand_hostname.o \
+       ../heimdal/lib/krb5/fcache.o \
+       ../heimdal/lib/krb5/free.o \
+       ../heimdal/lib/krb5/free_host_realm.o \
+       ../heimdal/lib/krb5/generate_seq_number.o \
+       ../heimdal/lib/krb5/generate_subkey.o \
+       ../heimdal/lib/krb5/get_cred.o \
+       ../heimdal/lib/krb5/get_default_principal.o \
+       ../heimdal/lib/krb5/get_default_realm.o \
+       ../heimdal/lib/krb5/get_for_creds.o \
+       ../heimdal/lib/krb5/get_host_realm.o \
+       ../heimdal/lib/krb5/get_in_tkt.o \
+       ../heimdal/lib/krb5/get_in_tkt_with_keytab.o \
+       ../heimdal/lib/krb5/get_port.o \
+       ../heimdal/lib/krb5/init_creds.o \
+       ../heimdal/lib/krb5/init_creds_pw.o \
+       ../heimdal/lib/krb5/kcm.o \
+       ../heimdal/lib/krb5/keyblock.o \
+       ../heimdal/lib/krb5/keytab.o \
+       ../heimdal/lib/krb5/keytab_any.o \
+       ../heimdal/lib/krb5/keytab_file.o \
+       ../heimdal/lib/krb5/keytab_memory.o \
+       ../heimdal/lib/krb5/keytab_keyfile.o \
+       ../heimdal/lib/krb5/keytab_krb4.o \
+       ../heimdal/lib/krb5/krbhst.o \
+       ../heimdal/lib/krb5/log.o \
+       ../heimdal/lib/krb5/mcache.o \
+       ../heimdal/lib/krb5/misc.o \
+       ../heimdal/lib/krb5/mk_error.o \
+       ../heimdal/lib/krb5/mk_priv.o \
+       ../heimdal/lib/krb5/mk_rep.o \
+       ../heimdal/lib/krb5/mk_req.o \
+       ../heimdal/lib/krb5/mk_req_ext.o \
+       ../heimdal/lib/krb5/mit_glue.o \
+       ../heimdal/lib/krb5/n-fold.o \
+       ../heimdal/lib/krb5/padata.o \
+       ../heimdal/lib/krb5/pkinit.o \
+       ../heimdal/lib/krb5/principal.o \
+       ../heimdal/lib/krb5/rd_cred.o \
+       ../heimdal/lib/krb5/rd_error.o \
+       ../heimdal/lib/krb5/rd_priv.o \
+       ../heimdal/lib/krb5/rd_rep.o \
+       ../heimdal/lib/krb5/rd_req.o \
+       ../heimdal/lib/krb5/replay.o \
+       ../heimdal/lib/krb5/send_to_kdc.o \
+       ../heimdal/lib/krb5/set_default_realm.o \
+       ../heimdal/lib/krb5/store.o \
+       ../heimdal/lib/krb5/store_emem.o \
+       ../heimdal/lib/krb5/store_fd.o \
+       ../heimdal/lib/krb5/store_mem.o \
+       ../heimdal/lib/krb5/ticket.o \
+       ../heimdal/lib/krb5/time.o \
+       ../heimdal/lib/krb5/transited.o \
+       ../heimdal/lib/krb5/v4_glue.o \
+       ../heimdal/lib/krb5/version.o \
+       ../heimdal/lib/krb5/warn.o \
+       ../heimdal/lib/krb5/krb5_err.o \
+       ../heimdal/lib/krb5/heim_err.o \
+       ../heimdal/lib/krb5/k524_err.o
 NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_KRB5
 #######################
@@ -184,72 +184,72 @@ NOPROTO = YES
 # Start SUBSYSTEM HEIMDAL_ASN1
 [SUBSYSTEM::HEIMDAL_ASN1]
 ADD_OBJ_FILES = \
-       heimdal/lib/asn1/der_get.o \
-       heimdal/lib/asn1/der_put.o \
-       heimdal/lib/asn1/der_free.o \
-       heimdal/lib/asn1/der_length.o \
-       heimdal/lib/asn1/der_copy.o \
-       heimdal/lib/asn1/der_cmp.o \
-       heimdal/lib/asn1/asn1_AD_IF_RELEVANT.o \
-       heimdal/lib/asn1/asn1_APOptions.o \
-       heimdal/lib/asn1/asn1_AP_REP.o \
-       heimdal/lib/asn1/asn1_AP_REQ.o \
-       heimdal/lib/asn1/asn1_AS_REP.o \
-       heimdal/lib/asn1/asn1_AS_REQ.o \
-       heimdal/lib/asn1/asn1_Authenticator.o \
-       heimdal/lib/asn1/asn1_AuthorizationData.o \
-       heimdal/lib/asn1/asn1_CBCParameter.o \
-       heimdal/lib/asn1/asn1_CKSUMTYPE.o \
-       heimdal/lib/asn1/asn1_ChangePasswdDataMS.o \
-       heimdal/lib/asn1/asn1_Checksum.o \
-       heimdal/lib/asn1/asn1_ENCTYPE.o \
-       heimdal/lib/asn1/asn1_ETYPE_INFO.o \
-       heimdal/lib/asn1/asn1_ETYPE_INFO2.o \
-       heimdal/lib/asn1/asn1_ETYPE_INFO2_ENTRY.o \
-       heimdal/lib/asn1/asn1_ETYPE_INFO_ENTRY.o \
-       heimdal/lib/asn1/asn1_EncAPRepPart.o \
-       heimdal/lib/asn1/asn1_EncASRepPart.o \
-       heimdal/lib/asn1/asn1_EncKDCRepPart.o \
-       heimdal/lib/asn1/asn1_EncKrbCredPart.o \
-       heimdal/lib/asn1/asn1_EncKrbPrivPart.o \
-       heimdal/lib/asn1/asn1_EncTGSRepPart.o \
-       heimdal/lib/asn1/asn1_EncTicketPart.o \
-       heimdal/lib/asn1/asn1_EncryptedData.o \
-       heimdal/lib/asn1/asn1_EncryptionKey.o \
-       heimdal/lib/asn1/asn1_EtypeList.o \
-       heimdal/lib/asn1/asn1_HostAddress.o \
-       heimdal/lib/asn1/asn1_HostAddresses.o \
-       heimdal/lib/asn1/asn1_KDCOptions.o \
-       heimdal/lib/asn1/asn1_KDC_REP.o \
-       heimdal/lib/asn1/asn1_KDC_REQ.o \
-       heimdal/lib/asn1/asn1_KDC_REQ_BODY.o \
-       heimdal/lib/asn1/asn1_KRB_CRED.o \
-       heimdal/lib/asn1/asn1_KRB_ERROR.o \
-       heimdal/lib/asn1/asn1_KRB_PRIV.o \
-       heimdal/lib/asn1/asn1_KerberosString.o \
-       heimdal/lib/asn1/asn1_KerberosTime.o \
-       heimdal/lib/asn1/asn1_KrbCredInfo.o \
-       heimdal/lib/asn1/asn1_LR_TYPE.o \
-       heimdal/lib/asn1/asn1_LastReq.o \
-       heimdal/lib/asn1/asn1_MESSAGE_TYPE.o \
-       heimdal/lib/asn1/asn1_METHOD_DATA.o \
-       heimdal/lib/asn1/asn1_NAME_TYPE.o \
-       heimdal/lib/asn1/asn1_PADATA_TYPE.o \
-       heimdal/lib/asn1/asn1_PA_DATA.o \
-       heimdal/lib/asn1/asn1_PA_ENC_TS_ENC.o \
-       heimdal/lib/asn1/asn1_PA_PAC_REQUEST.o \
-       heimdal/lib/asn1/asn1_Principal.o \
-       heimdal/lib/asn1/asn1_PrincipalName.o \
-       heimdal/lib/asn1/asn1_RC2CBCParameter.o \
-       heimdal/lib/asn1/asn1_Realm.o \
-       heimdal/lib/asn1/asn1_TGS_REP.o \
-       heimdal/lib/asn1/asn1_TGS_REQ.o \
-       heimdal/lib/asn1/asn1_Ticket.o \
-       heimdal/lib/asn1/asn1_TicketFlags.o \
-       heimdal/lib/asn1/asn1_TransitedEncoding.o \
-       heimdal/lib/asn1/asn1_err.o \
-       heimdal/lib/asn1/asn1_krb5int32.o \
-       heimdal/lib/asn1/asn1_krb5uint32.o
+       ../heimdal/lib/asn1/der_get.o \
+       ../heimdal/lib/asn1/der_put.o \
+       ../heimdal/lib/asn1/der_free.o \
+       ../heimdal/lib/asn1/der_length.o \
+       ../heimdal/lib/asn1/der_copy.o \
+       ../heimdal/lib/asn1/der_cmp.o \
+       ../heimdal/lib/asn1/asn1_AD_IF_RELEVANT.o \
+       ../heimdal/lib/asn1/asn1_APOptions.o \
+       ../heimdal/lib/asn1/asn1_AP_REP.o \
+       ../heimdal/lib/asn1/asn1_AP_REQ.o \
+       ../heimdal/lib/asn1/asn1_AS_REP.o \
+       ../heimdal/lib/asn1/asn1_AS_REQ.o \
+       ../heimdal/lib/asn1/asn1_Authenticator.o \
+       ../heimdal/lib/asn1/asn1_AuthorizationData.o \
+       ../heimdal/lib/asn1/asn1_CBCParameter.o \
+       ../heimdal/lib/asn1/asn1_CKSUMTYPE.o \
+       ../heimdal/lib/asn1/asn1_ChangePasswdDataMS.o \
+       ../heimdal/lib/asn1/asn1_Checksum.o \
+       ../heimdal/lib/asn1/asn1_ENCTYPE.o \
+       ../heimdal/lib/asn1/asn1_ETYPE_INFO.o \
+       ../heimdal/lib/asn1/asn1_ETYPE_INFO2.o \
+       ../heimdal/lib/asn1/asn1_ETYPE_INFO2_ENTRY.o \
+       ../heimdal/lib/asn1/asn1_ETYPE_INFO_ENTRY.o \
+       ../heimdal/lib/asn1/asn1_EncAPRepPart.o \
+       ../heimdal/lib/asn1/asn1_EncASRepPart.o \
+       ../heimdal/lib/asn1/asn1_EncKDCRepPart.o \
+       ../heimdal/lib/asn1/asn1_EncKrbCredPart.o \
+       ../heimdal/lib/asn1/asn1_EncKrbPrivPart.o \
+       ../heimdal/lib/asn1/asn1_EncTGSRepPart.o \
+       ../heimdal/lib/asn1/asn1_EncTicketPart.o \
+       ../heimdal/lib/asn1/asn1_EncryptedData.o \
+       ../heimdal/lib/asn1/asn1_EncryptionKey.o \
+       ../heimdal/lib/asn1/asn1_EtypeList.o \
+       ../heimdal/lib/asn1/asn1_HostAddress.o \
+       ../heimdal/lib/asn1/asn1_HostAddresses.o \
+       ../heimdal/lib/asn1/asn1_KDCOptions.o \
+       ../heimdal/lib/asn1/asn1_KDC_REP.o \
+       ../heimdal/lib/asn1/asn1_KDC_REQ.o \
+       ../heimdal/lib/asn1/asn1_KDC_REQ_BODY.o \
+       ../heimdal/lib/asn1/asn1_KRB_CRED.o \
+       ../heimdal/lib/asn1/asn1_KRB_ERROR.o \
+       ../heimdal/lib/asn1/asn1_KRB_PRIV.o \
+       ../heimdal/lib/asn1/asn1_KerberosString.o \
+       ../heimdal/lib/asn1/asn1_KerberosTime.o \
+       ../heimdal/lib/asn1/asn1_KrbCredInfo.o \
+       ../heimdal/lib/asn1/asn1_LR_TYPE.o \
+       ../heimdal/lib/asn1/asn1_LastReq.o \
+       ../heimdal/lib/asn1/asn1_MESSAGE_TYPE.o \
+       ../heimdal/lib/asn1/asn1_METHOD_DATA.o \
+       ../heimdal/lib/asn1/asn1_NAME_TYPE.o \
+       ../heimdal/lib/asn1/asn1_PADATA_TYPE.o \
+       ../heimdal/lib/asn1/asn1_PA_DATA.o \
+       ../heimdal/lib/asn1/asn1_PA_ENC_TS_ENC.o \
+       ../heimdal/lib/asn1/asn1_PA_PAC_REQUEST.o \
+       ../heimdal/lib/asn1/asn1_Principal.o \
+       ../heimdal/lib/asn1/asn1_PrincipalName.o \
+       ../heimdal/lib/asn1/asn1_RC2CBCParameter.o \
+       ../heimdal/lib/asn1/asn1_Realm.o \
+       ../heimdal/lib/asn1/asn1_TGS_REP.o \
+       ../heimdal/lib/asn1/asn1_TGS_REQ.o \
+       ../heimdal/lib/asn1/asn1_Ticket.o \
+       ../heimdal/lib/asn1/asn1_TicketFlags.o \
+       ../heimdal/lib/asn1/asn1_TransitedEncoding.o \
+       ../heimdal/lib/asn1/asn1_err.o \
+       ../heimdal/lib/asn1/asn1_krb5int32.o \
+       ../heimdal/lib/asn1/asn1_krb5uint32.o
 NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_KRB5
 #######################
@@ -258,16 +258,16 @@ NOPROTO = YES
 # Start SUBSYSTEM HEIMDAL_DES
 [SUBSYSTEM::HEIMDAL_DES]
 ADD_OBJ_FILES = \
-       heimdal/lib/des/aes.o \
-       heimdal/lib/des/des.o \
-       heimdal/lib/des/md4.o \
-       heimdal/lib/des/md5.o \
-       heimdal/lib/des/rc2.o \
-       heimdal/lib/des/rc4.o \
-       heimdal/lib/des/rijndael-alg-fst.o \
-       heimdal/lib/des/rnd_keys.o \
-       heimdal/lib/des/sha.o \
-       heimdal/lib/des/ui.o
+       ../heimdal/lib/des/aes.o \
+       ../heimdal/lib/des/des.o \
+       ../heimdal/lib/des/md4.o \
+       ../heimdal/lib/des/md5.o \
+       ../heimdal/lib/des/rc2.o \
+       ../heimdal/lib/des/rc4.o \
+       ../heimdal/lib/des/rijndael-alg-fst.o \
+       ../heimdal/lib/des/rnd_keys.o \
+       ../heimdal/lib/des/sha.o \
+       ../heimdal/lib/des/ui.o
 NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_DES
 #######################
@@ -275,51 +275,51 @@ NOPROTO = YES
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN_GAI_STRERROR
 [SUBSYSTEM::HEIMDAL_ROKEN_GAI_STRERROR]
-ADD_OBJ_FILES = heimdal/lib/roken/gai_strerror.o
+ADD_OBJ_FILES = ../heimdal/lib/roken/gai_strerror.o
 NOPROTO = YES
 
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN_GAI_STRERROR
 [SUBSYSTEM::HEIMDAL_ROKEN_INET_ATON]
-ADD_OBJ_FILES = heimdal/lib/roken/inet_aton.o
+ADD_OBJ_FILES = ../heimdal/lib/roken/inet_aton.o
 NOPROTO = YES
 
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN_ADDRINFO
 [SUBSYSTEM::HEIMDAL_ROKEN_ADDRINFO]
 ADD_OBJ_FILES = \
-       heimdal/lib/roken/getaddrinfo.o \
-       heimdal/lib/roken/freeaddrinfo.o \
-       heimdal/lib/roken/getipnodebyaddr.o \
-       heimdal/lib/roken/getipnodebyname.o \
-       heimdal/lib/roken/freehostent.o \
-       heimdal/lib/roken/copyhostent.o \
-       heimdal/lib/roken/hostent_find_fqdn.o
+       ../heimdal/lib/roken/getaddrinfo.o \
+       ../heimdal/lib/roken/freeaddrinfo.o \
+       ../heimdal/lib/roken/getipnodebyaddr.o \
+       ../heimdal/lib/roken/getipnodebyname.o \
+       ../heimdal/lib/roken/freehostent.o \
+       ../heimdal/lib/roken/copyhostent.o \
+       ../heimdal/lib/roken/hostent_find_fqdn.o
 NOPROTO = YES
 
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN
 [SUBSYSTEM::HEIMDAL_ROKEN]
 ADD_OBJ_FILES = \
-       heimdal/lib/roken/base64.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 \
-       heimdal/lib/roken/net_write.o \
-       heimdal/lib/roken/parse_time.o \
-       heimdal/lib/roken/parse_units.o \
-       heimdal/lib/roken/resolve.o \
-       heimdal/lib/roken/roken_gethostby.o \
-       heimdal/lib/roken/signal.o \
-       heimdal/lib/roken/vis.o \
-       heimdal/lib/roken/strlwr.o \
-       heimdal/lib/roken/strsep_copy.o \
-       heimdal/lib/roken/strupr.o \
-       heimdal/lib/roken/strpool.o \
-       heimdal_build/replace.o
+       ../heimdal/lib/roken/base64.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 \
+       ../heimdal/lib/roken/net_write.o \
+       ../heimdal/lib/roken/parse_time.o \
+       ../heimdal/lib/roken/parse_units.o \
+       ../heimdal/lib/roken/resolve.o \
+       ../heimdal/lib/roken/roken_gethostby.o \
+       ../heimdal/lib/roken/signal.o \
+       ../heimdal/lib/roken/vis.o \
+       ../heimdal/lib/roken/strlwr.o \
+       ../heimdal/lib/roken/strsep_copy.o \
+       ../heimdal/lib/roken/strupr.o \
+       ../heimdal/lib/roken/strpool.o \
+       replace.o
 REQUIRED_SUBSYSTEMS = \
                        HEIMDAL_ROKEN_ADDRINFO \
                        HEIMDAL_ROKEN_GAI_STRERROR \
@@ -332,7 +332,7 @@ NOPROTO = YES
 #######################
 # Start SUBSYSTEM HEIMDAL_VERS
 [SUBSYSTEM::HEIMDAL_VERS]
-ADD_OBJ_FILES = heimdal/lib/vers/print_version.o
+ADD_OBJ_FILES = ../heimdal/lib/vers/print_version.o
 NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_VERS
 #######################
@@ -340,7 +340,7 @@ NOPROTO = YES
 #######################
 # Start SUBSYSTEM HEIMDAL_GLUE
 [SUBSYSTEM::HEIMDAL_GLUE]
-ADD_OBJ_FILES = heimdal_build/glue.o
+ADD_OBJ_FILES = glue.o
 # End SUBSYSTEM HEIMDAL_GLUE
 #######################
 
@@ -348,8 +348,8 @@ ADD_OBJ_FILES = heimdal_build/glue.o
 # Start SUBSYSTEM HEIMDAL_COM_ERR
 [SUBSYSTEM::HEIMDAL_COM_ERR]
 ADD_OBJ_FILES = \
-       heimdal/lib/com_err/com_err.o \
-       heimdal/lib/com_err/error.o
+       ../heimdal/lib/com_err/com_err.o \
+       ../heimdal/lib/com_err/error.o
 NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_COM_ERR
 #######################
@@ -359,30 +359,30 @@ NOPROTO = YES
 [BINARY::asn1_compile]
 NOPROTO = YES
 OBJ_FILES = \
-       heimdal/lib/asn1/main.ho \
-       heimdal/lib/asn1/gen.ho \
-       heimdal/lib/asn1/gen_copy.ho \
-       heimdal/lib/asn1/gen_decode.ho \
-       heimdal/lib/asn1/gen_encode.ho \
-       heimdal/lib/asn1/gen_free.ho \
-       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 \
-       heimdal/lib/asn1/symbol.ho \
-       heimdal_build/replace.ho \
-       heimdal/lib/vers/print_version.ho \
-       lib/replace/snprintf.ho \
-       lib/replace/replace.ho
+       ../heimdal/lib/asn1/main.ho \
+       ../heimdal/lib/asn1/gen.ho \
+       ../heimdal/lib/asn1/gen_copy.ho \
+       ../heimdal/lib/asn1/gen_decode.ho \
+       ../heimdal/lib/asn1/gen_encode.ho \
+       ../heimdal/lib/asn1/gen_free.ho \
+       ../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 \
+       ../heimdal/lib/asn1/symbol.ho \
+       replace.ho \
+       ../heimdal/lib/vers/print_version.ho \
+       ../lib/replace/snprintf.ho \
+       ../lib/replace/replace.ho
 # End BINARY asn1_compile
 #######################
 
@@ -390,18 +390,18 @@ OBJ_FILES = \
 # Start BINARY compile_et
 [BINARY::compile_et]
 NOPROTO = YES
-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 \
-       heimdal_build/replace.ho \
-       lib/replace/snprintf.ho \
-       lib/replace/replace.ho
+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
 # End BINARY compile_et
 #######################
 
@@ -411,15 +411,15 @@ heimdal/lib/roken/vis.h: heimdal/lib/roken/vis.hin
 heimdal/lib/roken/err.h: heimdal/lib/roken/err.hin
        @cp heimdal/lib/roken/err.hin heimdal/lib/roken/err.h
 
-include ./heimdal_build/asn1_deps.pl heimdal/lib/hdb/hdb.asn1 hdb_asn1|
-include ./heimdal_build/asn1_deps.pl heimdal/lib/gssapi/spnego.asn1 spnego_asn1|
-include ./heimdal_build/asn1_deps.pl heimdal/lib/asn1/k5.asn1 krb5_asn1 --encode-rfc1510-bit-string|
+include asn1_deps.pl heimdal/lib/hdb/hdb.asn1 hdb_asn1|
+include asn1_deps.pl heimdal/lib/gssapi/spnego.asn1 spnego_asn1|
+include asn1_deps.pl heimdal/lib/asn1/k5.asn1 krb5_asn1 --encode-rfc1510-bit-string|
 
-include ./heimdal_build/et_deps.pl heimdal/lib/asn1/asn1_err.et|
-include ./heimdal_build/et_deps.pl heimdal/lib/hdb/hdb_err.et|
-include ./heimdal_build/et_deps.pl heimdal/lib/krb5/heim_err.et|
-include ./heimdal_build/et_deps.pl heimdal/lib/krb5/k524_err.et|
-include ./heimdal_build/et_deps.pl heimdal/lib/krb5/krb5_err.et|
+include et_deps.pl heimdal/lib/asn1/asn1_err.et|
+include et_deps.pl heimdal/lib/hdb/hdb_err.et|
+include et_deps.pl heimdal/lib/krb5/heim_err.et|
+include et_deps.pl heimdal/lib/krb5/k524_err.et|
+include et_deps.pl heimdal/lib/krb5/krb5_err.et|
 
 heimdal_basics: \
        heimdal/lib/roken/vis.h \
index 5939d0eacb4b3f30fc0f0fbd66ec61b68de5415a..9e07ecab19a8400209907b89951d2104e418d0d3 100644 (file)
@@ -4,10 +4,10 @@
 # Start SUBSYSTEM KDC
 [SUBSYSTEM::KDC]
 INIT_OBJ_FILES = \
-               kdc/kdc.o \
-               kdc/pac-glue.o \
-               kdc/hdb-ldb.o \
-               kdc/kpasswdd.o
+               kdc.o \
+               pac-glue.o \
+               hdb-ldb.o \
+               kpasswdd.o
 REQUIRED_SUBSYSTEMS = \
                LIBLDB KERBEROS_LIB HEIMDAL_KDC HEIMDAL_HDB 
 # End SUBSYSTEM KDC
index 6cd34d238e8c26dc54c1dfd7eec309630e2b1942..3e5122363bfcbc43c21dc930054da3b75015dc92 100644 (file)
 # Start SUBSYSTEM HEIMDAL
 [LIBRARY::HEIMDAL]
 ADD_OBJ_FILES = \
-       heimdal/lib/vers/print_version.o \
-       heimdal/kdc/default_config.o \
-       heimdal/kdc/kerberos5.o \
-       heimdal/kdc/pkinit.o \
-       heimdal/kdc/log.o \
-       heimdal/kdc/misc.o \
-       heimdal/kdc/524.o \
-       heimdal/kdc/kerberos4.o \
-       heimdal/kdc/kaserver.o \
-       heimdal/kdc/process.o \
-       heimdal/lib/hdb/common.o \
-       heimdal/lib/hdb/db.o \
-       heimdal/lib/hdb/hdb.o \
-       heimdal/lib/hdb/keys.o \
-       heimdal/lib/hdb/keytab.o \
-       heimdal/lib/hdb/mkey.o \
-       heimdal/lib/hdb/ndbm.o \
-       heimdal/lib/hdb/print.o \
-       heimdal/lib/hdb/asn1_Event.o \
-       heimdal/lib/hdb/asn1_GENERATION.o \
-       heimdal/lib/hdb/asn1_HDBFlags.o \
-       heimdal/lib/hdb/asn1_Key.o \
-       heimdal/lib/hdb/asn1_Salt.o \
-       heimdal/lib/hdb/asn1_hdb_entry.o \
-       heimdal/lib/hdb/hdb_err.o \
-       heimdal/lib/gssapi/init_sec_context.o \
-       heimdal/lib/gssapi/inquire_context.o \
-       heimdal/lib/gssapi/inquire_cred.o \
-       heimdal/lib/gssapi/inquire_cred_by_mech.o \
-       heimdal/lib/gssapi/inquire_mechs_for_name.o \
-       heimdal/lib/gssapi/inquire_names_for_mech.o \
-       heimdal/lib/gssapi/release_buffer.o \
-       heimdal/lib/gssapi/release_cred.o \
-       heimdal/lib/gssapi/release_name.o \
-       heimdal/lib/gssapi/release_oid_set.o \
-       heimdal/lib/gssapi/sequence.o \
-       heimdal/lib/gssapi/process_context_token.o \
-       heimdal/lib/gssapi/ticket_flags.o \
-       heimdal/lib/gssapi/test_oid_set_member.o \
-       heimdal/lib/gssapi/unwrap.o \
-       heimdal/lib/gssapi/v1.o \
-       heimdal/lib/gssapi/verify_mic.o \
-       heimdal/lib/gssapi/wrap.o \
-       heimdal/lib/gssapi/address_to_krb5addr.o \
-       heimdal/lib/gssapi/asn1_ContextFlags.o \
-       heimdal/lib/gssapi/asn1_MechType.o \
-       heimdal/lib/gssapi/asn1_MechTypeList.o \
-       heimdal/lib/gssapi/asn1_NegotiationToken.o \
-       heimdal/lib/gssapi/asn1_NegTokenInit.o \
-       heimdal/lib/gssapi/asn1_NegTokenTarg.o \
-       heimdal/lib/gssapi/8003.o \
-       heimdal/lib/gssapi/accept_sec_context.o \
-       heimdal/lib/gssapi/acquire_cred.o \
-       heimdal/lib/gssapi/add_cred.o \
-       heimdal/lib/gssapi/add_oid_set_member.o \
-       heimdal/lib/gssapi/arcfour.o \
-       heimdal/lib/gssapi/canonicalize_name.o \
-       heimdal/lib/gssapi/ccache_name.o \
-       heimdal/lib/gssapi/cfx.o \
-       heimdal/lib/gssapi/compare_name.o \
-       heimdal/lib/gssapi/compat.o \
-       heimdal/lib/gssapi/context_time.o \
-       heimdal/lib/gssapi/copy_ccache.o \
-       heimdal/lib/gssapi/create_emtpy_oid_set.o \
-       heimdal/lib/gssapi/decapsulate.o \
-       heimdal/lib/gssapi/delete_sec_context.o \
-       heimdal/lib/gssapi/display_name.o \
-       heimdal/lib/gssapi/display_status.o \
-       heimdal/lib/gssapi/duplicate_name.o \
-       heimdal/lib/gssapi/encapsulate.o \
-       heimdal/lib/gssapi/export_sec_context.o \
-       heimdal/lib/gssapi/export_name.o \
-       heimdal/lib/gssapi/external.o \
-       heimdal/lib/gssapi/get_mic.o \
-       heimdal/lib/gssapi/import_name.o \
-       heimdal/lib/gssapi/import_sec_context.o \
-       heimdal/lib/gssapi/indicate_mechs.o \
-       heimdal/lib/gssapi/init.o \
-       heimdal/lib/krb5/acache.o \
-       heimdal/lib/krb5/acl.o \
-       heimdal/lib/krb5/add_et_list.o \
-       heimdal/lib/krb5/addr_families.o \
-       heimdal/lib/krb5/aname_to_localname.o \
-       heimdal/lib/krb5/appdefault.o \
-       heimdal/lib/krb5/asn1_glue.o \
-       heimdal/lib/krb5/auth_context.o \
-       heimdal/lib/krb5/build_ap_req.o \
-       heimdal/lib/krb5/build_auth.o \
-       heimdal/lib/krb5/cache.o \
-       heimdal/lib/krb5/changepw.o \
-       heimdal/lib/krb5/codec.o \
-       heimdal/lib/krb5/config_file.o \
-       heimdal/lib/krb5/config_file_netinfo.o \
-       heimdal/lib/krb5/convert_creds.o \
-       heimdal/lib/krb5/constants.o \
-       heimdal/lib/krb5/context.o \
-       heimdal/lib/krb5/copy_host_realm.o \
-       heimdal/lib/krb5/crc.o \
-       heimdal/lib/krb5/creds.o \
-       heimdal/lib/krb5/crypto.o \
-       heimdal/lib/krb5/data.o \
-       heimdal/lib/krb5/eai_to_heim_errno.o \
-       heimdal/lib/krb5/error_string.o \
-       heimdal/lib/krb5/expand_hostname.o \
-       heimdal/lib/krb5/fcache.o \
-       heimdal/lib/krb5/free.o \
-       heimdal/lib/krb5/free_host_realm.o \
-       heimdal/lib/krb5/generate_seq_number.o \
-       heimdal/lib/krb5/generate_subkey.o \
-       heimdal/lib/krb5/get_addrs.o \
-       heimdal/lib/krb5/get_cred.o \
-       heimdal/lib/krb5/get_default_principal.o \
-       heimdal/lib/krb5/get_default_realm.o \
-       heimdal/lib/krb5/get_for_creds.o \
-       heimdal/lib/krb5/get_host_realm.o \
-       heimdal/lib/krb5/get_in_tkt.o \
-       heimdal/lib/krb5/get_in_tkt_pw.o \
-       heimdal/lib/krb5/get_in_tkt_with_keytab.o \
-       heimdal/lib/krb5/get_in_tkt_with_skey.o \
-       heimdal/lib/krb5/get_port.o \
-       heimdal/lib/krb5/init_creds.o \
-       heimdal/lib/krb5/init_creds_pw.o \
-       heimdal/lib/krb5/kcm.o \
-       heimdal/lib/krb5/keyblock.o \
-       heimdal/lib/krb5/keytab.o \
-       heimdal/lib/krb5/keytab_any.o \
-       heimdal/lib/krb5/keytab_file.o \
-       heimdal/lib/krb5/keytab_memory.o \
-       heimdal/lib/krb5/keytab_keyfile.o \
-       heimdal/lib/krb5/keytab_krb4.o \
-       heimdal/lib/krb5/krbhst.o \
-       heimdal/lib/krb5/kuserok.o \
-       heimdal/lib/krb5/log.o \
-       heimdal/lib/krb5/mcache.o \
-       heimdal/lib/krb5/misc.o \
-       heimdal/lib/krb5/mk_error.o \
-       heimdal/lib/krb5/mk_priv.o \
-       heimdal/lib/krb5/mk_rep.o \
-       heimdal/lib/krb5/mk_req.o \
-       heimdal/lib/krb5/mk_req_ext.o \
-       heimdal/lib/krb5/mk_safe.o \
-       heimdal/lib/krb5/mit_glue.o \
-       heimdal/lib/krb5/net_read.o \
-       heimdal/lib/krb5/net_write.o \
-       heimdal/lib/krb5/n-fold.o \
-       heimdal/lib/krb5/padata.o \
-       heimdal/lib/krb5/pkinit.o \
-       heimdal/lib/krb5/principal.o \
-       heimdal/lib/krb5/prog_setup.o \
-       heimdal/lib/krb5/prompter_posix.o \
-       heimdal/lib/krb5/rd_cred.o \
-       heimdal/lib/krb5/rd_error.o \
-       heimdal/lib/krb5/rd_priv.o \
-       heimdal/lib/krb5/rd_rep.o \
-       heimdal/lib/krb5/rd_req.o \
-       heimdal/lib/krb5/rd_safe.o \
-       heimdal/lib/krb5/read_message.o \
-       heimdal/lib/krb5/recvauth.o \
-       heimdal/lib/krb5/replay.o \
-       heimdal/lib/krb5/send_to_kdc.o \
-       heimdal/lib/krb5/sendauth.o \
-       heimdal/lib/krb5/set_default_realm.o \
-       heimdal/lib/krb5/sock_principal.o \
-       heimdal/lib/krb5/store.o \
-       heimdal/lib/krb5/store_emem.o \
-       heimdal/lib/krb5/store_fd.o \
-       heimdal/lib/krb5/store_mem.o \
-       heimdal/lib/krb5/ticket.o \
-       heimdal/lib/krb5/time.o \
-       heimdal/lib/krb5/transited.o \
-       heimdal/lib/krb5/v4_glue.o \
-       heimdal/lib/krb5/verify_init.o \
-       heimdal/lib/krb5/verify_user.o \
-       heimdal/lib/krb5/version.o \
-       heimdal/lib/krb5/warn.o \
-       heimdal/lib/krb5/write_message.o \
-       heimdal/lib/krb5/krb5_err.o \
-       heimdal/lib/krb5/heim_err.o \
-       heimdal/lib/krb5/k524_err.o \
-       heimdal/lib/asn1/der_get.o \
-       heimdal/lib/asn1/der_put.o \
-       heimdal/lib/asn1/der_free.o \
-       heimdal/lib/asn1/der_length.o \
-       heimdal/lib/asn1/der_copy.o \
-       heimdal/lib/asn1/der_cmp.o \
-       heimdal/lib/asn1/timegm.o \
-       heimdal/lib/asn1/asn1_AD_AND_OR.o \
-       heimdal/lib/asn1/asn1_AD_IF_RELEVANT.o \
-       heimdal/lib/asn1/asn1_AD_KDCIssued.o \
-       heimdal/lib/asn1/asn1_AD_MANDATORY_FOR_KDC.o \
-       heimdal/lib/asn1/asn1_APOptions.o \
-       heimdal/lib/asn1/asn1_AP_REP.o \
-       heimdal/lib/asn1/asn1_AP_REQ.o \
-       heimdal/lib/asn1/asn1_AS_REP.o \
-       heimdal/lib/asn1/asn1_AS_REQ.o \
-       heimdal/lib/asn1/asn1_Authenticator.o \
-       heimdal/lib/asn1/asn1_AuthorizationData.o \
-       heimdal/lib/asn1/asn1_AUTHDATA_TYPE.o \
-       heimdal/lib/asn1/asn1_CBCParameter.o \
-       heimdal/lib/asn1/asn1_CKSUMTYPE.o \
-       heimdal/lib/asn1/asn1_ChangePasswdDataMS.o \
-       heimdal/lib/asn1/asn1_Checksum.o \
-       heimdal/lib/asn1/asn1_ENCTYPE.o \
-       heimdal/lib/asn1/asn1_ETYPE_INFO.o \
-       heimdal/lib/asn1/asn1_ETYPE_INFO2.o \
-       heimdal/lib/asn1/asn1_ETYPE_INFO2_ENTRY.o \
-       heimdal/lib/asn1/asn1_ETYPE_INFO_ENTRY.o \
-       heimdal/lib/asn1/asn1_EncAPRepPart.o \
-       heimdal/lib/asn1/asn1_EncASRepPart.o \
-       heimdal/lib/asn1/asn1_EncKDCRepPart.o \
-       heimdal/lib/asn1/asn1_EncKrbCredPart.o \
-       heimdal/lib/asn1/asn1_EncKrbPrivPart.o \
-       heimdal/lib/asn1/asn1_EncTGSRepPart.o \
-       heimdal/lib/asn1/asn1_EncTicketPart.o \
-       heimdal/lib/asn1/asn1_EncryptedData.o \
-       heimdal/lib/asn1/asn1_EncryptionKey.o \
-       heimdal/lib/asn1/asn1_EtypeList.o \
-       heimdal/lib/asn1/asn1_HostAddress.o \
-       heimdal/lib/asn1/asn1_HostAddresses.o \
-       heimdal/lib/asn1/asn1_KDCOptions.o \
-       heimdal/lib/asn1/asn1_KDC_REP.o \
-       heimdal/lib/asn1/asn1_KDC_REQ.o \
-       heimdal/lib/asn1/asn1_KDC_REQ_BODY.o \
-       heimdal/lib/asn1/asn1_KRB_CRED.o \
-       heimdal/lib/asn1/asn1_KRB_ERROR.o \
-       heimdal/lib/asn1/asn1_KRB_PRIV.o \
-       heimdal/lib/asn1/asn1_KRB_SAFE.o \
-       heimdal/lib/asn1/asn1_KRB_SAFE_BODY.o \
-       heimdal/lib/asn1/asn1_KerberosString.o \
-       heimdal/lib/asn1/asn1_KerberosTime.o \
-       heimdal/lib/asn1/asn1_KrbCredInfo.o \
-       heimdal/lib/asn1/asn1_LR_TYPE.o \
-       heimdal/lib/asn1/asn1_LastReq.o \
-       heimdal/lib/asn1/asn1_MESSAGE_TYPE.o \
-       heimdal/lib/asn1/asn1_METHOD_DATA.o \
-       heimdal/lib/asn1/asn1_NAME_TYPE.o \
-       heimdal/lib/asn1/asn1_PADATA_TYPE.o \
-       heimdal/lib/asn1/asn1_PA_DATA.o \
-       heimdal/lib/asn1/asn1_PA_ENC_SAM_RESPONSE_ENC.o \
-       heimdal/lib/asn1/asn1_PA_ENC_TS_ENC.o \
-       heimdal/lib/asn1/asn1_PA_PAC_REQUEST.o \
-       heimdal/lib/asn1/asn1_PA_SAM_CHALLENGE_2.o \
-       heimdal/lib/asn1/asn1_PA_SAM_CHALLENGE_2_BODY.o \
-       heimdal/lib/asn1/asn1_PA_SAM_REDIRECT.o \
-       heimdal/lib/asn1/asn1_PA_SAM_RESPONSE_2.o \
-       heimdal/lib/asn1/asn1_PA_SAM_TYPE.o \
-       heimdal/lib/asn1/asn1_Principal.o \
-       heimdal/lib/asn1/asn1_PrincipalName.o \
-       heimdal/lib/asn1/asn1_RC2CBCParameter.o \
-       heimdal/lib/asn1/asn1_Realm.o \
-       heimdal/lib/asn1/asn1_SAMFlags.o \
-       heimdal/lib/asn1/asn1_TGS_REP.o \
-       heimdal/lib/asn1/asn1_TGS_REQ.o \
-       heimdal/lib/asn1/asn1_Ticket.o \
-       heimdal/lib/asn1/asn1_TicketFlags.o \
-       heimdal/lib/asn1/asn1_TransitedEncoding.o \
-       heimdal/lib/asn1/asn1_UNSIGNED.o \
-       heimdal/lib/asn1/asn1_err.o \
-       heimdal/lib/des/aes.o \
-       heimdal/lib/des/des.o \
-       heimdal/lib/des/md4.o \
-       heimdal/lib/des/md5.o \
-       heimdal/lib/des/rc2.o \
-       heimdal/lib/des/rc4.o \
-       heimdal/lib/des/rijndael-alg-fst.o \
-       heimdal/lib/des/rnd_keys.o \
-       heimdal/lib/des/sha.o \
-       heimdal/lib/des/ui.o \
-       heimdal/lib/roken/base64.o \
-       heimdal/lib/roken/bswap.o \
-       heimdal/lib/roken/concat.o \
-       heimdal/lib/roken/environment.o \
-       heimdal/lib/roken/eread.o \
-       heimdal/lib/roken/esetenv.o \
-       heimdal/lib/roken/ewrite.o \
-       heimdal/lib/roken/getaddrinfo_hostspec.o \
-       heimdal/lib/roken/get_default_username.o \
-       heimdal/lib/roken/get_window_size.o \
-       heimdal/lib/roken/getarg.o \
-       heimdal/lib/roken/getnameinfo_verified.o \
-       heimdal/lib/roken/getprogname.o \
-       heimdal/lib/roken/h_errno.o \
-       heimdal/lib/roken/hex.o \
-       heimdal/lib/roken/hostent_find_fqdn.o \
-       heimdal/lib/roken/issuid.o \
-       heimdal/lib/roken/k_getpwnam.o \
-       heimdal/lib/roken/k_getpwuid.o \
-       heimdal/lib/roken/mini_inetd.o \
-       heimdal/lib/roken/net_read.o \
-       heimdal/lib/roken/net_write.o \
-       heimdal/lib/roken/parse_bytes.o \
-       heimdal/lib/roken/parse_time.o \
-       heimdal/lib/roken/parse_units.o \
-       heimdal/lib/roken/realloc.o \
-       heimdal/lib/roken/resolve.o \
-       heimdal/lib/roken/roken_gethostby.o \
-       heimdal/lib/roken/rtbl.o \
-       heimdal/lib/roken/setprogname.o \
-       heimdal/lib/roken/signal.o \
-       heimdal/lib/roken/simple_exec.o \
-       heimdal/lib/roken/snprintf.o \
-       heimdal/lib/roken/socket.o \
-       heimdal/lib/roken/strcollect.o \
-       heimdal/lib/roken/timeval.o \
-       heimdal/lib/roken/tm2time.o \
-       heimdal/lib/roken/unvis.o \
-       heimdal/lib/roken/verify.o \
-       heimdal/lib/roken/vis.o \
-       heimdal/lib/roken/warnerr.o \
-       heimdal/lib/roken/write_pid.o \
-       heimdal/lib/roken/glob.o \
-       heimdal/lib/roken/getcap.o \
-       heimdal/lib/roken/copyhostent.o \
-       heimdal/lib/roken/closefrom.o \
-       heimdal/lib/roken/ecalloc.o \
-       heimdal/lib/roken/emalloc.o \
-       heimdal/lib/roken/erealloc.o \
-       heimdal/lib/roken/estrdup.o \
-       heimdal/lib/roken/freehostent.o \
-       heimdal/lib/roken/getipnodebyaddr.o \
-       heimdal/lib/roken/getipnodebyname.o \
-       heimdal/lib/editline/strlcat.o \
-       heimdal/lib/otp/strlcat.o \
-       heimdal/lib/roken/strlcat.o \
-       heimdal/lib/kafs/strlcpy.o \
-       heimdal/lib/otp/strlcpy.o \
-       heimdal/lib/roken/strlcpy.o \
-       heimdal/lib/otp/strlwr.o \
-       heimdal/lib/roken/strlwr.o \
-       heimdal/lib/roken/strsep_copy.o \
-       heimdal/lib/sl/strupr.o \
-       heimdal/lib/roken/strupr.o
+       ../heimdal/lib/vers/print_version.o \
+       ../heimdal/kdc/default_config.o \
+       ../heimdal/kdc/kerberos5.o \
+       ../heimdal/kdc/pkinit.o \
+       ../heimdal/kdc/log.o \
+       ../heimdal/kdc/misc.o \
+       ../heimdal/kdc/524.o \
+       ../heimdal/kdc/kerberos4.o \
+       ../heimdal/kdc/kaserver.o \
+       ../heimdal/kdc/process.o \
+       ../heimdal/lib/hdb/common.o \
+       ../heimdal/lib/hdb/db.o \
+       ../heimdal/lib/hdb/hdb.o \
+       ../heimdal/lib/hdb/keys.o \
+       ../heimdal/lib/hdb/keytab.o \
+       ../heimdal/lib/hdb/mkey.o \
+       ../heimdal/lib/hdb/ndbm.o \
+       ../heimdal/lib/hdb/print.o \
+       ../heimdal/lib/hdb/asn1_Event.o \
+       ../heimdal/lib/hdb/asn1_GENERATION.o \
+       ../heimdal/lib/hdb/asn1_HDBFlags.o \
+       ../heimdal/lib/hdb/asn1_Key.o \
+       ../heimdal/lib/hdb/asn1_Salt.o \
+       ../heimdal/lib/hdb/asn1_hdb_entry.o \
+       ../heimdal/lib/hdb/hdb_err.o \
+       ../heimdal/lib/gssapi/init_sec_context.o \
+       ../heimdal/lib/gssapi/inquire_context.o \
+       ../heimdal/lib/gssapi/inquire_cred.o \
+       ../heimdal/lib/gssapi/inquire_cred_by_mech.o \
+       ../heimdal/lib/gssapi/inquire_mechs_for_name.o \
+       ../heimdal/lib/gssapi/inquire_names_for_mech.o \
+       ../heimdal/lib/gssapi/release_buffer.o \
+       ../heimdal/lib/gssapi/release_cred.o \
+       ../heimdal/lib/gssapi/release_name.o \
+       ../heimdal/lib/gssapi/release_oid_set.o \
+       ../heimdal/lib/gssapi/sequence.o \
+       ../heimdal/lib/gssapi/process_context_token.o \
+       ../heimdal/lib/gssapi/ticket_flags.o \
+       ../heimdal/lib/gssapi/test_oid_set_member.o \
+       ../heimdal/lib/gssapi/unwrap.o \
+       ../heimdal/lib/gssapi/v1.o \
+       ../heimdal/lib/gssapi/verify_mic.o \
+       ../heimdal/lib/gssapi/wrap.o \
+       ../heimdal/lib/gssapi/address_to_krb5addr.o \
+       ../heimdal/lib/gssapi/asn1_ContextFlags.o \
+       ../heimdal/lib/gssapi/asn1_MechType.o \
+       ../heimdal/lib/gssapi/asn1_MechTypeList.o \
+       ../heimdal/lib/gssapi/asn1_NegotiationToken.o \
+       ../heimdal/lib/gssapi/asn1_NegTokenInit.o \
+       ../heimdal/lib/gssapi/asn1_NegTokenTarg.o \
+       ../heimdal/lib/gssapi/8003.o \
+       ../heimdal/lib/gssapi/accept_sec_context.o \
+       ../heimdal/lib/gssapi/acquire_cred.o \
+       ../heimdal/lib/gssapi/add_cred.o \
+       ../heimdal/lib/gssapi/add_oid_set_member.o \
+       ../heimdal/lib/gssapi/arcfour.o \
+       ../heimdal/lib/gssapi/canonicalize_name.o \
+       ../heimdal/lib/gssapi/ccache_name.o \
+       ../heimdal/lib/gssapi/cfx.o \
+       ../heimdal/lib/gssapi/compare_name.o \
+       ../heimdal/lib/gssapi/compat.o \
+       ../heimdal/lib/gssapi/context_time.o \
+       ../heimdal/lib/gssapi/copy_ccache.o \
+       ../heimdal/lib/gssapi/create_emtpy_oid_set.o \
+       ../heimdal/lib/gssapi/decapsulate.o \
+       ../heimdal/lib/gssapi/delete_sec_context.o \
+       ../heimdal/lib/gssapi/display_name.o \
+       ../heimdal/lib/gssapi/display_status.o \
+       ../heimdal/lib/gssapi/duplicate_name.o \
+       ../heimdal/lib/gssapi/encapsulate.o \
+       ../heimdal/lib/gssapi/export_sec_context.o \
+       ../heimdal/lib/gssapi/export_name.o \
+       ../heimdal/lib/gssapi/external.o \
+       ../heimdal/lib/gssapi/get_mic.o \
+       ../heimdal/lib/gssapi/import_name.o \
+       ../heimdal/lib/gssapi/import_sec_context.o \
+       ../heimdal/lib/gssapi/indicate_mechs.o \
+       ../heimdal/lib/gssapi/init.o \
+       ../heimdal/lib/krb5/acache.o \
+       ../heimdal/lib/krb5/acl.o \
+       ../heimdal/lib/krb5/add_et_list.o \
+       ../heimdal/lib/krb5/addr_families.o \
+       ../heimdal/lib/krb5/aname_to_localname.o \
+       ../heimdal/lib/krb5/appdefault.o \
+       ../heimdal/lib/krb5/asn1_glue.o \
+       ../heimdal/lib/krb5/auth_context.o \
+       ../heimdal/lib/krb5/build_ap_req.o \
+       ../heimdal/lib/krb5/build_auth.o \
+       ../heimdal/lib/krb5/cache.o \
+       ../heimdal/lib/krb5/changepw.o \
+       ../heimdal/lib/krb5/codec.o \
+       ../heimdal/lib/krb5/config_file.o \
+       ../heimdal/lib/krb5/config_file_netinfo.o \
+       ../heimdal/lib/krb5/convert_creds.o \
+       ../heimdal/lib/krb5/constants.o \
+       ../heimdal/lib/krb5/context.o \
+       ../heimdal/lib/krb5/copy_host_realm.o \
+       ../heimdal/lib/krb5/crc.o \
+       ../heimdal/lib/krb5/creds.o \
+       ../heimdal/lib/krb5/crypto.o \
+       ../heimdal/lib/krb5/data.o \
+       ../heimdal/lib/krb5/eai_to_heim_errno.o \
+       ../heimdal/lib/krb5/error_string.o \
+       ../heimdal/lib/krb5/expand_hostname.o \
+       ../heimdal/lib/krb5/fcache.o \
+       ../heimdal/lib/krb5/free.o \
+       ../heimdal/lib/krb5/free_host_realm.o \
+       ../heimdal/lib/krb5/generate_seq_number.o \
+       ../heimdal/lib/krb5/generate_subkey.o \
+       ../heimdal/lib/krb5/get_addrs.o \
+       ../heimdal/lib/krb5/get_cred.o \
+       ../heimdal/lib/krb5/get_default_principal.o \
+       ../heimdal/lib/krb5/get_default_realm.o \
+       ../heimdal/lib/krb5/get_for_creds.o \
+       ../heimdal/lib/krb5/get_host_realm.o \
+       ../heimdal/lib/krb5/get_in_tkt.o \
+       ../heimdal/lib/krb5/get_in_tkt_pw.o \
+       ../heimdal/lib/krb5/get_in_tkt_with_keytab.o \
+       ../heimdal/lib/krb5/get_in_tkt_with_skey.o \
+       ../heimdal/lib/krb5/get_port.o \
+       ../heimdal/lib/krb5/init_creds.o \
+       ../heimdal/lib/krb5/init_creds_pw.o \
+       ../heimdal/lib/krb5/kcm.o \
+       ../heimdal/lib/krb5/keyblock.o \
+       ../heimdal/lib/krb5/keytab.o \
+       ../heimdal/lib/krb5/keytab_any.o \
+       ../heimdal/lib/krb5/keytab_file.o \
+       ../heimdal/lib/krb5/keytab_memory.o \
+       ../heimdal/lib/krb5/keytab_keyfile.o \
+       ../heimdal/lib/krb5/keytab_krb4.o \
+       ../heimdal/lib/krb5/krbhst.o \
+       ../heimdal/lib/krb5/kuserok.o \
+       ../heimdal/lib/krb5/log.o \
+       ../heimdal/lib/krb5/mcache.o \
+       ../heimdal/lib/krb5/misc.o \
+       ../heimdal/lib/krb5/mk_error.o \
+       ../heimdal/lib/krb5/mk_priv.o \
+       ../heimdal/lib/krb5/mk_rep.o \
+       ../heimdal/lib/krb5/mk_req.o \
+       ../heimdal/lib/krb5/mk_req_ext.o \
+       ../heimdal/lib/krb5/mk_safe.o \
+       ../heimdal/lib/krb5/mit_glue.o \
+       ../heimdal/lib/krb5/net_read.o \
+       ../heimdal/lib/krb5/net_write.o \
+       ../heimdal/lib/krb5/n-fold.o \
+       ../heimdal/lib/krb5/padata.o \
+       ../heimdal/lib/krb5/pkinit.o \
+       ../heimdal/lib/krb5/principal.o \
+       ../heimdal/lib/krb5/prog_setup.o \
+       ../heimdal/lib/krb5/prompter_posix.o \
+       ../heimdal/lib/krb5/rd_cred.o \
+       ../heimdal/lib/krb5/rd_error.o \
+       ../heimdal/lib/krb5/rd_priv.o \
+       ../heimdal/lib/krb5/rd_rep.o \
+       ../heimdal/lib/krb5/rd_req.o \
+       ../heimdal/lib/krb5/rd_safe.o \
+       ../heimdal/lib/krb5/read_message.o \
+       ../heimdal/lib/krb5/recvauth.o \
+       ../heimdal/lib/krb5/replay.o \
+       ../heimdal/lib/krb5/send_to_kdc.o \
+       ../heimdal/lib/krb5/sendauth.o \
+       ../heimdal/lib/krb5/set_default_realm.o \
+       ../heimdal/lib/krb5/sock_principal.o \
+       ../heimdal/lib/krb5/store.o \
+       ../heimdal/lib/krb5/store_emem.o \
+       ../heimdal/lib/krb5/store_fd.o \
+       ../heimdal/lib/krb5/store_mem.o \
+       ../heimdal/lib/krb5/ticket.o \
+       ../heimdal/lib/krb5/time.o \
+       ../heimdal/lib/krb5/transited.o \
+       ../heimdal/lib/krb5/v4_glue.o \
+       ../heimdal/lib/krb5/verify_init.o \
+       ../heimdal/lib/krb5/verify_user.o \
+       ../heimdal/lib/krb5/version.o \
+       ../heimdal/lib/krb5/warn.o \
+       ../heimdal/lib/krb5/write_message.o \
+       ../heimdal/lib/krb5/krb5_err.o \
+       ../heimdal/lib/krb5/heim_err.o \
+       ../heimdal/lib/krb5/k524_err.o \
+       ../heimdal/lib/asn1/der_get.o \
+       ../heimdal/lib/asn1/der_put.o \
+       ../heimdal/lib/asn1/der_free.o \
+       ../heimdal/lib/asn1/der_length.o \
+       ../heimdal/lib/asn1/der_copy.o \
+       ../heimdal/lib/asn1/der_cmp.o \
+       ../heimdal/lib/asn1/timegm.o \
+       ../heimdal/lib/asn1/asn1_AD_AND_OR.o \
+       ../heimdal/lib/asn1/asn1_AD_IF_RELEVANT.o \
+       ../heimdal/lib/asn1/asn1_AD_KDCIssued.o \
+       ../heimdal/lib/asn1/asn1_AD_MANDATORY_FOR_KDC.o \
+       ../heimdal/lib/asn1/asn1_APOptions.o \
+       ../heimdal/lib/asn1/asn1_AP_REP.o \
+       ../heimdal/lib/asn1/asn1_AP_REQ.o \
+       ../heimdal/lib/asn1/asn1_AS_REP.o \
+       ../heimdal/lib/asn1/asn1_AS_REQ.o \
+       ../heimdal/lib/asn1/asn1_Authenticator.o \
+       ../heimdal/lib/asn1/asn1_AuthorizationData.o \
+       ../heimdal/lib/asn1/asn1_AUTHDATA_TYPE.o \
+       ../heimdal/lib/asn1/asn1_CBCParameter.o \
+       ../heimdal/lib/asn1/asn1_CKSUMTYPE.o \
+       ../heimdal/lib/asn1/asn1_ChangePasswdDataMS.o \
+       ../heimdal/lib/asn1/asn1_Checksum.o \
+       ../heimdal/lib/asn1/asn1_ENCTYPE.o \
+       ../heimdal/lib/asn1/asn1_ETYPE_INFO.o \
+       ../heimdal/lib/asn1/asn1_ETYPE_INFO2.o \
+       ../heimdal/lib/asn1/asn1_ETYPE_INFO2_ENTRY.o \
+       ../heimdal/lib/asn1/asn1_ETYPE_INFO_ENTRY.o \
+       ../heimdal/lib/asn1/asn1_EncAPRepPart.o \
+       ../heimdal/lib/asn1/asn1_EncASRepPart.o \
+       ../heimdal/lib/asn1/asn1_EncKDCRepPart.o \
+       ../heimdal/lib/asn1/asn1_EncKrbCredPart.o \
+       ../heimdal/lib/asn1/asn1_EncKrbPrivPart.o \
+       ../heimdal/lib/asn1/asn1_EncTGSRepPart.o \
+       ../heimdal/lib/asn1/asn1_EncTicketPart.o \
+       ../heimdal/lib/asn1/asn1_EncryptedData.o \
+       ../heimdal/lib/asn1/asn1_EncryptionKey.o \
+       ../heimdal/lib/asn1/asn1_EtypeList.o \
+       ../heimdal/lib/asn1/asn1_HostAddress.o \
+       ../heimdal/lib/asn1/asn1_HostAddresses.o \
+       ../heimdal/lib/asn1/asn1_KDCOptions.o \
+       ../heimdal/lib/asn1/asn1_KDC_REP.o \
+       ../heimdal/lib/asn1/asn1_KDC_REQ.o \
+       ../heimdal/lib/asn1/asn1_KDC_REQ_BODY.o \
+       ../heimdal/lib/asn1/asn1_KRB_CRED.o \
+       ../heimdal/lib/asn1/asn1_KRB_ERROR.o \
+       ../heimdal/lib/asn1/asn1_KRB_PRIV.o \
+       ../heimdal/lib/asn1/asn1_KRB_SAFE.o \
+       ../heimdal/lib/asn1/asn1_KRB_SAFE_BODY.o \
+       ../heimdal/lib/asn1/asn1_KerberosString.o \
+       ../heimdal/lib/asn1/asn1_KerberosTime.o \
+       ../heimdal/lib/asn1/asn1_KrbCredInfo.o \
+       ../heimdal/lib/asn1/asn1_LR_TYPE.o \
+       ../heimdal/lib/asn1/asn1_LastReq.o \
+       ../heimdal/lib/asn1/asn1_MESSAGE_TYPE.o \
+       ../heimdal/lib/asn1/asn1_METHOD_DATA.o \
+       ../heimdal/lib/asn1/asn1_NAME_TYPE.o \
+       ../heimdal/lib/asn1/asn1_PADATA_TYPE.o \
+       ../heimdal/lib/asn1/asn1_PA_DATA.o \
+       ../heimdal/lib/asn1/asn1_PA_ENC_SAM_RESPONSE_ENC.o \
+       ../heimdal/lib/asn1/asn1_PA_ENC_TS_ENC.o \
+       ../heimdal/lib/asn1/asn1_PA_PAC_REQUEST.o \
+       ../heimdal/lib/asn1/asn1_PA_SAM_CHALLENGE_2.o \
+       ../heimdal/lib/asn1/asn1_PA_SAM_CHALLENGE_2_BODY.o \
+       ../heimdal/lib/asn1/asn1_PA_SAM_REDIRECT.o \
+       ../heimdal/lib/asn1/asn1_PA_SAM_RESPONSE_2.o \
+       ../heimdal/lib/asn1/asn1_PA_SAM_TYPE.o \
+       ../heimdal/lib/asn1/asn1_Principal.o \
+       ../heimdal/lib/asn1/asn1_PrincipalName.o \
+       ../heimdal/lib/asn1/asn1_RC2CBCParameter.o \
+       ../heimdal/lib/asn1/asn1_Realm.o \
+       ../heimdal/lib/asn1/asn1_SAMFlags.o \
+       ../heimdal/lib/asn1/asn1_TGS_REP.o \
+       ../heimdal/lib/asn1/asn1_TGS_REQ.o \
+       ../heimdal/lib/asn1/asn1_Ticket.o \
+       ../heimdal/lib/asn1/asn1_TicketFlags.o \
+       ../heimdal/lib/asn1/asn1_TransitedEncoding.o \
+       ../heimdal/lib/asn1/asn1_UNSIGNED.o \
+       ../heimdal/lib/asn1/asn1_err.o \
+       ../heimdal/lib/des/aes.o \
+       ../heimdal/lib/des/des.o \
+       ../heimdal/lib/des/md4.o \
+       ../heimdal/lib/des/md5.o \
+       ../heimdal/lib/des/rc2.o \
+       ../heimdal/lib/des/rc4.o \
+       ../heimdal/lib/des/rijndael-alg-fst.o \
+       ../heimdal/lib/des/rnd_keys.o \
+       ../heimdal/lib/des/sha.o \
+       ../heimdal/lib/des/ui.o \
+       ../heimdal/lib/roken/base64.o \
+       ../heimdal/lib/roken/bswap.o \
+       ../heimdal/lib/roken/concat.o \
+       ../heimdal/lib/roken/environment.o \
+       ../heimdal/lib/roken/eread.o \
+       ../heimdal/lib/roken/esetenv.o \
+       ../heimdal/lib/roken/ewrite.o \
+       ../heimdal/lib/roken/getaddrinfo_hostspec.o \
+       ../heimdal/lib/roken/get_default_username.o \
+       ../heimdal/lib/roken/get_window_size.o \
+       ../heimdal/lib/roken/getarg.o \
+       ../heimdal/lib/roken/getnameinfo_verified.o \
+       ../heimdal/lib/roken/getprogname.o \
+       ../heimdal/lib/roken/h_errno.o \
+       ../heimdal/lib/roken/hex.o \
+       ../heimdal/lib/roken/hostent_find_fqdn.o \
+       ../heimdal/lib/roken/issuid.o \
+       ../heimdal/lib/roken/k_getpwnam.o \
+       ../heimdal/lib/roken/k_getpwuid.o \
+       ../heimdal/lib/roken/mini_inetd.o \
+       ../heimdal/lib/roken/net_read.o \
+       ../heimdal/lib/roken/net_write.o \
+       ../heimdal/lib/roken/parse_bytes.o \
+       ../heimdal/lib/roken/parse_time.o \
+       ../heimdal/lib/roken/parse_units.o \
+       ../heimdal/lib/roken/realloc.o \
+       ../heimdal/lib/roken/resolve.o \
+       ../heimdal/lib/roken/roken_gethostby.o \
+       ../heimdal/lib/roken/rtbl.o \
+       ../heimdal/lib/roken/setprogname.o \
+       ../heimdal/lib/roken/signal.o \
+       ../heimdal/lib/roken/simple_exec.o \
+       ../heimdal/lib/roken/snprintf.o \
+       ../heimdal/lib/roken/socket.o \
+       ../heimdal/lib/roken/strcollect.o \
+       ../heimdal/lib/roken/timeval.o \
+       ../heimdal/lib/roken/tm2time.o \
+       ../heimdal/lib/roken/unvis.o \
+       ../heimdal/lib/roken/verify.o \
+       ../heimdal/lib/roken/vis.o \
+       ../heimdal/lib/roken/warnerr.o \
+       ../heimdal/lib/roken/write_pid.o \
+       ../heimdal/lib/roken/glob.o \
+       ../heimdal/lib/roken/getcap.o \
+       ../heimdal/lib/roken/copyhostent.o \
+       ../heimdal/lib/roken/closefrom.o \
+       ../heimdal/lib/roken/ecalloc.o \
+       ../heimdal/lib/roken/emalloc.o \
+       ../heimdal/lib/roken/erealloc.o \
+       ../heimdal/lib/roken/estrdup.o \
+       ../heimdal/lib/roken/freehostent.o \
+       ../heimdal/lib/roken/getipnodebyaddr.o \
+       ../heimdal/lib/roken/getipnodebyname.o \
+       ../heimdal/lib/editline/strlcat.o \
+       ../heimdal/lib/otp/strlcat.o \
+       ../heimdal/lib/roken/strlcat.o \
+       ../heimdal/lib/kafs/strlcpy.o \
+       ../heimdal/lib/otp/strlcpy.o \
+       ../heimdal/lib/roken/strlcpy.o \
+       ../heimdal/lib/otp/strlwr.o \
+       ../heimdal/lib/roken/strlwr.o \
+       ../heimdal/lib/roken/strsep_copy.o \
+       ../heimdal/lib/sl/strupr.o \
+       ../heimdal/lib/roken/strupr.o
 NOPROTO = YES
 TARGET_CFLAGS = -Iheimdal/lib/krb5 -Iheimdal/kdc -Iheimdal/lib/asn1 -Iheimdal/lib/des
 # End SUBSYSTEM HEIMDAL
index 59f1d5c178c9385f3849ad3777cfc4113800a119..38afb3fc5cc284c7cc03c3f601f4eace9ce0b864 100644 (file)
@@ -4,11 +4,11 @@
 # Start SUBSYSTEM LDAP
 [SUBSYSTEM::LDAP]
 INIT_OBJ_FILES = \
-               ldap_server/ldap_server.o \
-               ldap_server/ldap_backend.o \
-               ldap_server/ldap_bind.o \
-               ldap_server/ldap_rootdse.o \
-               ldap_server/ldap_simple_ldb.o 
+               ldap_server.o \
+               ldap_backend.o \
+               ldap_bind.o \
+               ldap_rootdse.o \
+               ldap_simple_ldb.o 
 REQUIRED_SUBSYSTEMS = \
                LIBCLI_LDAP SAMDB
 # End SUBSYSTEM SMB
index 1a73d6834ab4bf7c3571b77111a9cafe14e2bb53..593404c87b69c760953a8f6cb8105682e9f09c53 100644 (file)
@@ -2,8 +2,8 @@
 # Start SUBSYSTEM MPR
 [SUBSYSTEM::MPR]
 ADD_OBJ_FILES = \
-               lib/appweb/mpr/miniMpr.o \
-               lib/appweb/mpr/var.o
+               mpr/miniMpr.o \
+               mpr/var.o
 NOPROTO=YES
 # End SUBSYSTEM MPR
 #######################
@@ -13,10 +13,10 @@ NOPROTO=YES
 # Start SUBSYSTEM EJS
 [SUBSYSTEM::EJS]
 ADD_OBJ_FILES = \
-               lib/appweb/ejs/ejsLib.o  \
-               lib/appweb/ejs/ejsLex.o \
-               lib/appweb/ejs/ejsParser.o \
-               lib/appweb/ejs/ejsProcs.o
+               ejs/ejsLib.o  \
+               ejs/ejsLex.o \
+               ejs/ejsParser.o \
+               ejs/ejsProcs.o
 REQUIRED_SUBSYSTEMS = MPR
 NOPROTO=YES
 # End SUBSYSTEM EJS
@@ -26,8 +26,8 @@ NOPROTO=YES
 # Start SUBSYSTEM ESP
 [SUBSYSTEM::ESP]
 ADD_OBJ_FILES = \
-               lib/appweb/esp/esp.o  \
-               lib/appweb/esp/espProcs.o
+               esp/esp.o  \
+               esp/espProcs.o
 REQUIRED_SUBSYSTEMS = EJS
 NOPROTO=YES
 # End SUBSYSTEM ESP
index 18f6f3aeb9581dd0ba3cdf8cc9e704d9b0ffa76d..3ed538190873aea09fb817b06eaa4a8955d6abb8 100644 (file)
@@ -1,29 +1,45 @@
 # LIB BASIC subsystem
+include com/config.mk
+include samba3/config.mk
+include socket/config.mk
+include charset/config.mk
+include ldb/config.mk
+include talloc/config.mk
+include tdb/config.mk
+include tls/config.mk
+include registry/config.mk
+include messaging/config.mk
+include events/config.mk
+include popt/config.mk
+include cmdline/config.mk
+include socket_wrapper/config.mk
+include appweb/config.mk
+include replace/config.mk
 
 ##############################
 # Start SUBSYSTEM LIBNETIF
 [SUBSYSTEM::LIBNETIF]
 INIT_OBJ_FILES = \
-               lib/netif/interface.o
+               netif/interface.o
 ADD_OBJ_FILES = \
-               lib/netif/netif.o
+               netif/netif.o
 # End SUBSYSTEM LIBNETIF
 ##############################
 
 [SUBSYSTEM::TDR]
-INIT_OBJ_FILES = lib/tdr/tdr.o
+INIT_OBJ_FILES = tdr/tdr.o
 
 ##############################
 # Start SUBSYSTEM LIBCRYPTO
 [SUBSYSTEM::LIBCRYPTO]
 NOPROTO = YES
 INIT_OBJ_FILES = \
-               lib/crypto/crc32.o
+               crypto/crc32.o
 ADD_OBJ_FILES = \
-               lib/crypto/md5.o \
-               lib/crypto/hmacmd5.o \
-               lib/crypto/md4.o \
-               lib/crypto/arcfour.o
+               crypto/md5.o \
+               crypto/hmacmd5.o \
+               crypto/md4.o \
+               crypto/arcfour.o
 # End SUBSYSTEM LIBCRYPTO
 ##############################
 
@@ -31,42 +47,42 @@ ADD_OBJ_FILES = \
 # Start SUBSYSTEM LIBCOMPRESSION
 [SUBSYSTEM::LIBCOMPRESSION]
 INIT_OBJ_FILES = \
-               lib/compression/mszip.o
+               compression/mszip.o
 # End SUBSYSTEM LIBCOMPRESION
 ################################################
 
 [SUBSYSTEM::GENCACHE]
 OBJ_FILES = \
-               lib/gencache.o \
+               gencache.o \
 
 ##############################
 # Start SUBSYSTEM LIBBASIC
 [SUBSYSTEM::LIBBASIC]
-INIT_OBJ_FILES = lib/version.o
+INIT_OBJ_FILES = version.o
 ADD_OBJ_FILES = \
-               lib/xfile.o \
-               lib/debug.o \
-               lib/fault.o \
-               lib/signal.o \
-               lib/system.o \
-               lib/time.o \
-               lib/genrand.o \
-               lib/dprintf.o \
-               lib/util_str.o \
-               lib/util_strlist.o \
-               lib/util_unistr.o \
-               lib/util_file.o \
-               lib/data_blob.o \
-               lib/util.o \
-               lib/util_sock.o \
-               lib/substitute.o \
-               lib/fsusage.o \
-               lib/ms_fnmatch.o \
-               lib/select.o \
-               lib/mutex.o \
-               lib/idtree.o \
-               lib/db_wrap.o \
-               lib/gendb.o
+               xfile.o \
+               debug.o \
+               fault.o \
+               signal.o \
+               system.o \
+               time.o \
+               genrand.o \
+               dprintf.o \
+               util_str.o \
+               util_strlist.o \
+               util_unistr.o \
+               util_file.o \
+               data_blob.o \
+               util.o \
+               util_sock.o \
+               substitute.o \
+               fsusage.o \
+               ms_fnmatch.o \
+               select.o \
+               mutex.o \
+               idtree.o \
+               db_wrap.o \
+               gendb.o
 REQUIRED_SUBSYSTEMS = \
                LIBLDB CHARSET LIBREPLACE LIBNETIF LIBCRYPTO EXT_LIB_DL LIBTALLOC \
                SOCKET_WRAPPER CONFIG
@@ -74,7 +90,7 @@ REQUIRED_SUBSYSTEMS = \
 ##############################
 
 [SUBSYSTEM::PIDFILE]
-OBJ_FILES = lib/pidfile.o
+OBJ_FILES = pidfile.o
 
 [SUBSYSTEM::UNIX_PRIVS]
-OBJ_FILES = lib/unix_privs.o
+OBJ_FILES = unix_privs.o
index 6b0fe02b7227858d265f10a8090f9d5966bf89b3..b61f9e7ea2b0178d5688eff5d3de07e76a2c8fa2 100644 (file)
@@ -2,9 +2,9 @@
 # Start SUBSYSTEM CHARSET
 [SUBSYSTEM::CHARSET]
 INIT_OBJ_FILES = \
-               lib/charset/iconv.o
+               iconv.o
 ADD_OBJ_FILES = \
-               lib/charset/charcnv.o
+               charcnv.o
 REQUIRED_SUBSYSTEMS = EXT_LIB_ICONV
 # End SUBSYSTEM CHARSET
 ################################################
index 643fa9f1afd670245b7ec6e3ad53539459676f8e..badb2f6dcf7c8845ae56bae57bc9d9bafa308ed8 100644 (file)
@@ -1,8 +1,8 @@
 ##############################
 # Start SUBSYSTEM LIBCMDLINE_CREDENTIALS
 [SUBSYSTEM::LIBCMDLINE_CREDENTIALS]
-ADD_OBJ_FILES = lib/cmdline/getsmbpass.o \
-               lib/cmdline/credentials.o
+ADD_OBJ_FILES = getsmbpass.o \
+               credentials.o
 REQUIRED_SUBSYSTEMS = CREDENTIALS
 # End SUBSYSTEM LIBCMDLINE_CREDENTIALS
 ##############################
index 4c0377795ca01fad2ec540e5c64d2f965e9c9aee..dc4fe644c6980b9d0bc607ace0020538e3cd1ba0 100644 (file)
@@ -1,17 +1,17 @@
 [SUBSYSTEM::COM]
 INIT_OBJ_FILES = \
-               lib/com/tables.o \
-               lib/com/rot.o \
-               lib/com/main.o
+               tables.o \
+               rot.o \
+               main.o
 
 [SUBSYSTEM::DCOM]
 INIT_OBJ_FILES = \
-               lib/com/dcom/main.o \
-               lib/com/dcom/tables.o
+               dcom/main.o \
+               dcom/tables.o
 REQUIRED_SUBSYSTEMS = COM DCOM_PROXY_DCOM RPC_NDR_REMACT \
                                          RPC_NDR_OXIDRESOLVER
 
 [MODULE::com_simple]
 SUBSYSTEM = COM
-INIT_OBJ_FILES = lib/com/classes/simple.o
+INIT_OBJ_FILES = classes/simple.o
 INIT_FUNCTION = com_simple_init
index 4fe0856f8866ae8828ff94ccfe4b8a4fdc748378..60d01b556867870eb5b1cd361130aa78b579c8d4 100644 (file)
@@ -2,8 +2,8 @@
 # Start SUBSYSTEM LIBEVENTS
 [SUBSYSTEM::LIBEVENTS]
 NOPROTO = YES
-INIT_OBJ_FILES = lib/events/events.o
-ADD_OBJ_FILES = lib/events/events_standard.o
+INIT_OBJ_FILES = events.o
+ADD_OBJ_FILES = events_standard.o
 REQUIRED_SUBSYSTEMS = LIBTALLOC
 # End SUBSYSTEM LIBEVENTS
 ##############################
index 205ddc972c00fd3761b21cdee310bc60725dec94..b30ffc36c837c7da5377f8aadbb81f089d17c15b 100644 (file)
@@ -3,7 +3,7 @@
 [MODULE::libldb_operational]
 SUBSYSTEM = LIBLDB
 INIT_OBJ_FILES = \
-               lib/ldb/modules/operational.o
+               modules/operational.o
 # End MODULE libldb_operational
 ################################################
 
@@ -12,7 +12,7 @@ INIT_OBJ_FILES = \
 [MODULE::libldb_rdn_name]
 SUBSYSTEM = LIBLDB
 INIT_OBJ_FILES = \
-               lib/ldb/modules/rdn_name.o
+               modules/rdn_name.o
 # End MODULE libldb_rdn_name
 ################################################
 
@@ -21,7 +21,7 @@ INIT_OBJ_FILES = \
 [MODULE::libldb_schema]
 SUBSYSTEM = LIBLDB
 INIT_OBJ_FILES = \
-               lib/ldb/modules/schema.o
+               modules/schema.o
 # End MODULE libldb_schema
 ################################################
 
@@ -30,7 +30,7 @@ INIT_OBJ_FILES = \
 [MODULE::libldb_ildap]
 SUBSYSTEM = LIBLDB
 INIT_OBJ_FILES = \
-               lib/ldb/ldb_ildap/ldb_ildap.o
+               ldb_ildap/ldb_ildap.o
 REQUIRED_SUBSYSTEMS = \
                LIBCLI_LDAP
 NOPROTO = YES
@@ -41,7 +41,7 @@ NOPROTO = YES
 # Start MODULE libldb_map
 [MODULE::libldb_map]
 SUBSYSTEM = LIBLDB
-INIT_OBJ_FILES = lib/ldb/modules/ldb_map.o
+INIT_OBJ_FILES = modules/ldb_map.o
 # End MODULE libldb_map
 ################################################
 
@@ -50,7 +50,7 @@ INIT_OBJ_FILES = lib/ldb/modules/ldb_map.o
 [MODULE::libldb_sqlite3]
 SUBSYSTEM = LIBLDB
 INIT_OBJ_FILES = \
-               lib/ldb/ldb_sqlite3/ldb_sqlite3.o
+               ldb_sqlite3/ldb_sqlite3.o
 REQUIRED_SUBSYSTEMS = \
                EXT_LIB_SQLITE3
 NOPROTO = YES
@@ -62,13 +62,13 @@ NOPROTO = YES
 [MODULE::libldb_tdb]
 SUBSYSTEM = LIBLDB
 INIT_OBJ_FILES = \
-               lib/ldb/ldb_tdb/ldb_tdb.o
+               ldb_tdb/ldb_tdb.o
 ADD_OBJ_FILES = \
-               lib/ldb/ldb_tdb/ldb_search.o \
-               lib/ldb/ldb_tdb/ldb_pack.o \
-               lib/ldb/ldb_tdb/ldb_index.o \
-               lib/ldb/ldb_tdb/ldb_cache.o \
-               lib/ldb/ldb_tdb/ldb_tdb_wrap.o
+               ldb_tdb/ldb_search.o \
+               ldb_tdb/ldb_pack.o \
+               ldb_tdb/ldb_index.o \
+               ldb_tdb/ldb_cache.o \
+               ldb_tdb/ldb_tdb_wrap.o
 REQUIRED_SUBSYSTEMS = \
                LIBTDB
 NOPROTO = YES
@@ -79,22 +79,22 @@ NOPROTO = YES
 # Start SUBSYSTEM LIBLDB
 [SUBSYSTEM::LIBLDB]
 INIT_OBJ_FILES = \
-               lib/ldb/common/ldb.o
+               common/ldb.o
 ADD_OBJ_FILES = \
-               lib/ldb/common/ldb_ldif.o \
-               lib/ldb/common/ldb_parse.o \
-               lib/ldb/common/ldb_msg.o \
-               lib/ldb/common/ldb_utf8.o \
-               lib/ldb/common/ldb_debug.o \
-               lib/ldb/common/ldb_modules.o \
-               lib/ldb/common/ldb_match.o \
-               lib/ldb/common/ldb_attributes.o \
-               lib/ldb/common/attrib_handlers.o \
-               lib/ldb/common/ldb_dn.o
+               common/ldb_ldif.o \
+               common/ldb_parse.o \
+               common/ldb_msg.o \
+               common/ldb_utf8.o \
+               common/ldb_debug.o \
+               common/ldb_modules.o \
+               common/ldb_match.o \
+               common/ldb_attributes.o \
+               common/attrib_handlers.o \
+               common/ldb_dn.o
 REQUIRED_SUBSYSTEMS = \
                LIBREPLACE LIBTALLOC LDBSAMBA
 NOPROTO = YES
-MANPAGE = lib/ldb/man/ldb.3
+MANPAGE = man/ldb.3
 #
 # End SUBSYSTEM LIBLDB
 ################################################
@@ -115,7 +115,7 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM LDBSAMBA
 [SUBSYSTEM::LDBSAMBA]
 OBJ_FILES = \
-               lib/ldb/samba/ldif_handlers.o
+               samba/ldif_handlers.o
 # End SUBSYSTEM LDBSAMBA
 ################################################
 
@@ -123,7 +123,7 @@ OBJ_FILES = \
 # Start SUBSYSTEM LIBLDB_CMDLINE
 [SUBSYSTEM::LIBLDB_CMDLINE]
 OBJ_FILES= \
-               lib/ldb/tools/cmdline.o
+               tools/cmdline.o
 REQUIRED_SUBSYSTEMS = LIBLDB LIBCMDLINE LIBBASIC
 # End SUBSYSTEM LIBLDB_CMDLINE
 ################################################
@@ -133,10 +133,10 @@ REQUIRED_SUBSYSTEMS = LIBLDB LIBCMDLINE LIBBASIC
 [BINARY::ldbadd]
 INSTALLDIR = BINDIR
 OBJ_FILES = \
-               lib/ldb/tools/ldbadd.o
+               tools/ldbadd.o
 REQUIRED_SUBSYSTEMS = \
                LIBLDB_CMDLINE
-MANPAGE = lib/ldb/man/ldbadd.1
+MANPAGE = man/ldbadd.1
 # End BINARY ldbadd
 ################################################
 
@@ -145,10 +145,10 @@ MANPAGE = lib/ldb/man/ldbadd.1
 [BINARY::ldbdel]
 INSTALLDIR = BINDIR
 OBJ_FILES= \
-               lib/ldb/tools/ldbdel.o
+               tools/ldbdel.o
 REQUIRED_SUBSYSTEMS = \
                LIBLDB_CMDLINE
-MANPAGE = lib/ldb/man/ldbdel.1
+MANPAGE = man/ldbdel.1
 # End BINARY ldbdel
 ################################################
 
@@ -157,10 +157,10 @@ MANPAGE = lib/ldb/man/ldbdel.1
 [BINARY::ldbmodify]
 INSTALLDIR = BINDIR
 OBJ_FILES= \
-               lib/ldb/tools/ldbmodify.o
+               tools/ldbmodify.o
 REQUIRED_SUBSYSTEMS = \
                LIBLDB_CMDLINE
-MANPAGE = lib/ldb/man/ldbmodify.1
+MANPAGE = man/ldbmodify.1
 # End BINARY ldbmodify
 ################################################
 
@@ -169,10 +169,10 @@ MANPAGE = lib/ldb/man/ldbmodify.1
 [BINARY::ldbsearch]
 INSTALLDIR = BINDIR
 OBJ_FILES= \
-               lib/ldb/tools/ldbsearch.o
+               tools/ldbsearch.o
 REQUIRED_SUBSYSTEMS = \
                LIBLDB_CMDLINE 
-MANPAGE = lib/ldb/man/ldbsearch.1
+MANPAGE = man/ldbsearch.1
 # End BINARY ldbsearch
 ################################################
 
@@ -181,10 +181,10 @@ MANPAGE = lib/ldb/man/ldbsearch.1
 [BINARY::ldbedit]
 INSTALLDIR = BINDIR
 OBJ_FILES= \
-               lib/ldb/tools/ldbedit.o
+               tools/ldbedit.o
 REQUIRED_SUBSYSTEMS = \
                LIBLDB_CMDLINE
-MANPAGE = lib/ldb/man/ldbedit.1
+MANPAGE = man/ldbedit.1
 # End BINARY ldbedit
 ################################################
 
@@ -193,10 +193,10 @@ MANPAGE = lib/ldb/man/ldbedit.1
 [BINARY::ldbrename]
 INSTALLDIR = BINDIR
 OBJ_FILES= \
-               lib/ldb/tools/ldbrename.o
+               tools/ldbrename.o
 REQUIRED_SUBSYSTEMS = \
                LIBLDB_CMDLINE
-MANPAGE = lib/ldb/man/ldbrename.1
+MANPAGE = man/ldbrename.1
 # End BINARY ldbrename
 ################################################
 
@@ -205,7 +205,7 @@ MANPAGE = lib/ldb/man/ldbrename.1
 [BINARY::ldbtest]
 INSTALLDIR = BINDIR
 OBJ_FILES= \
-               lib/ldb/tools/ldbtest.o
+               tools/ldbtest.o
 REQUIRED_SUBSYSTEMS = \
                LIBLDB_CMDLINE
 # End BINARY ldbtest
@@ -216,7 +216,7 @@ REQUIRED_SUBSYSTEMS = \
 [BINARY::oLschema2ldif]
 INSTALLDIR = BINDIR
 OBJ_FILES= \
-               lib/ldb/tools/oLschema2ldif.o
+               tools/oLschema2ldif.o
 REQUIRED_SUBSYSTEMS = \
                LIBLDB_CMDLINE
 # End BINARY oLschema2ldif
index 2cba66f0a36b74e5496c77a8d264867d68439995..7643ec09edcf5ef7c5ce035289551024f7b6b4af 100644 (file)
@@ -3,9 +3,9 @@
 # Start SUBSYSTEM MESSAGING
 [SUBSYSTEM::MESSAGING]
 INIT_OBJ_FILES = \
-               lib/messaging/messaging.o
+               messaging.o
 # \
-#              lib/messaging/msgutil.o
+#              msgutil.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = \
                NDR_IRPC \
index fee3ab1e4b3b96762c0d52ed161e7391e8165506..9140716b477bdfdf485f4d830afd42ab538211e8 100644 (file)
@@ -1,11 +1,11 @@
 ##############################
 # Start SUBSYSTEM INT_LIB_POPT
 [SUBSYSTEM::INT_LIB_POPT]
-ADD_OBJ_FILES = lib/popt/findme.o \
-                               lib/popt/popt.o \
-                               lib/popt/poptconfig.o \
-                               lib/popt/popthelp.o \
-                               lib/popt/poptparse.o
+ADD_OBJ_FILES = findme.o \
+                               popt.o \
+                               poptconfig.o \
+                               popthelp.o \
+                               poptparse.o
 NOPROTO = YES
 # End SUBSYSTEM INT_LIB_POPT
 ##############################
index 8a579d45646058095dc71f5560fddbba128710f5..9461bb2a95d205a2f4561a7011ba1d9d91d5a026 100644 (file)
@@ -6,7 +6,7 @@
 INIT_FUNCTION = registry_nt4_init
 SUBSYSTEM = REGISTRY
 INIT_OBJ_FILES = \
-               lib/registry/reg_backend_nt4.o
+               reg_backend_nt4.o
 REQUIRED_SUBSYSTEMS = TDR_REGF
 # End MODULE registry_nt4
 ################################################
@@ -14,7 +14,7 @@ REQUIRED_SUBSYSTEMS = TDR_REGF
 [SUBSYSTEM::TDR_REGF]
 REQUIRED_SUBSYSTEMS = TDR 
 NOPROTO = YES
-INIT_OBJ_FILES = lib/registry/tdr_regf.o
+INIT_OBJ_FILES = tdr_regf.o
 
 lib/registry/reg_backend_nt4.c: lib/registry/tdr_regf.c
 lib/registry/tdr_regf.c: lib/registry/regf.idl
@@ -26,7 +26,7 @@ lib/registry/tdr_regf.c: lib/registry/regf.idl
 INIT_FUNCTION = registry_w95_init
 SUBSYSTEM = REGISTRY
 INIT_OBJ_FILES = \
-               lib/registry/reg_backend_w95.o
+               reg_backend_w95.o
 # End MODULE registry_w95
 ################################################
 
@@ -36,7 +36,7 @@ INIT_OBJ_FILES = \
 INIT_FUNCTION = registry_dir_init
 SUBSYSTEM = REGISTRY
 INIT_OBJ_FILES = \
-               lib/registry/reg_backend_dir.o
+               reg_backend_dir.o
 # End MODULE registry_dir
 ################################################
 
@@ -46,7 +46,7 @@ INIT_OBJ_FILES = \
 INIT_FUNCTION = registry_rpc_init
 SUBSYSTEM = REGISTRY
 INIT_OBJ_FILES = \
-               lib/registry/reg_backend_rpc.o
+               reg_backend_rpc.o
 REQUIRED_SUBSYSTEMS = RPC_NDR_WINREG
 # End MODULE registry_rpc
 ################################################
@@ -59,7 +59,7 @@ REQUIRED_SUBSYSTEMS = RPC_NDR_WINREG
 INIT_FUNCTION = registry_gconf_init
 SUBSYSTEM = REGISTRY
 INIT_OBJ_FILES = \
-               lib/registry/reg_backend_gconf.o
+               reg_backend_gconf.o
 REQUIRED_SUBSYSTEMS = EXT_LIB_gconf
 # End MODULE registry_gconf
 ################################################
@@ -70,7 +70,7 @@ REQUIRED_SUBSYSTEMS = EXT_LIB_gconf
 INIT_FUNCTION = registry_ldb_init
 SUBSYSTEM = REGISTRY
 INIT_OBJ_FILES = \
-               lib/registry/reg_backend_ldb.o
+               reg_backend_ldb.o
 REQUIRED_SUBSYSTEMS = \
                LIBLDB
 # End MODULE registry_ldb
@@ -80,11 +80,11 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM REGISTRY
 [SUBSYSTEM::REGISTRY]
 INIT_OBJ_FILES = \
-               lib/registry/common/reg_interface.o
+               common/reg_interface.o
 ADD_OBJ_FILES = \
-               lib/registry/common/reg_util.o \
-               lib/registry/reg_samba.o \
-               lib/registry/patchfile.o
+               common/reg_util.o \
+               reg_samba.o \
+               patchfile.o
 REQUIRED_SUBSYSTEMS = \
                LIBBASIC
 # End MODULE registry_ldb
@@ -107,10 +107,10 @@ REQUIRED_SUBSYSTEMS = \
 [BINARY::regdiff]
 INSTALLDIR = BINDIR
 OBJ_FILES= \
-               lib/registry/tools/regdiff.o
+               tools/regdiff.o
 REQUIRED_SUBSYSTEMS = \
                CONFIG LIBCMDLINE REGISTRY
-MANPAGE = lib/registry/man/regdiff.1
+MANPAGE = man/regdiff.1
 # End BINARY regdiff
 ################################################
 
@@ -119,10 +119,10 @@ MANPAGE = lib/registry/man/regdiff.1
 [BINARY::regpatch]
 INSTALLDIR = BINDIR
 OBJ_FILES= \
-               lib/registry/tools/regpatch.o
+               tools/regpatch.o
 REQUIRED_SUBSYSTEMS = \
                CONFIG LIBCMDLINE REGISTRY
-MANPAGE = lib/registry/man/regpatch.1
+MANPAGE = man/regpatch.1
 # End BINARY regpatch
 ################################################
 
@@ -131,10 +131,10 @@ MANPAGE = lib/registry/man/regpatch.1
 [BINARY::regshell]
 INSTALLDIR = BINDIR
 OBJ_FILES= \
-               lib/registry/tools/regshell.o
+               tools/regshell.o
 REQUIRED_SUBSYSTEMS = \
                CONFIG LIBCMDLINE REGISTRY
-MANPAGE = lib/registry/man/regshell.1
+MANPAGE = man/regshell.1
 # End BINARY regshell
 ################################################
 
@@ -143,9 +143,9 @@ MANPAGE = lib/registry/man/regshell.1
 [BINARY::regtree]
 INSTALLDIR = BINDIR
 OBJ_FILES= \
-               lib/registry/tools/regtree.o
+               tools/regtree.o
 REQUIRED_SUBSYSTEMS = \
                CONFIG LIBCMDLINE REGISTRY
-MANPAGE = lib/registry/man/regtree.1
+MANPAGE = man/regtree.1
 # End BINARY regtree
 ################################################
index 2658f0e96a95fa63996f85d72fd9daf1f2f6e42f..49133651b4cfb6c664b93dc3ebb65aca697d3105 100644 (file)
@@ -2,7 +2,7 @@
 # Start SUBSYSTEM REPLACE_READDIR
 [SUBSYSTEM::REPLACE_READDIR]
 ADD_OBJ_FILES = \
-               lib/replace/repdir/repdir.o
+               repdir/repdir.o
 NOPROTO = YES
 # End SUBSYSTEM REPLACE_READDIR
 ##############################
@@ -11,10 +11,10 @@ NOPROTO = YES
 ##############################
 # Start SUBSYSTEM LIBREPLACE
 [SUBSYSTEM::LIBREPLACE]
-INIT_OBJ_FILES = lib/replace/replace.o
+INIT_OBJ_FILES = replace.o
 ADD_OBJ_FILES = \
-               lib/replace/snprintf.o \
-               lib/replace/dlfcn.o
+               snprintf.o \
+               dlfcn.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = REPLACE_READDIR
 # End SUBSYSTEM LIBREPLACE
index db5d04ddaa6f84ebf477cd68784ac97d34f2aab2..bd135ed7ef49c0a67b083dacb669d0994b0514bf 100644 (file)
@@ -2,15 +2,15 @@
 # Start SUBSYSTEM LIBSAMBA3
 [SUBSYSTEM::LIBSAMBA3]
 ADD_OBJ_FILES = \
-               lib/samba3/smbpasswd.o \
-               lib/samba3/tdbsam.o \
-               lib/samba3/policy.o \
-               lib/samba3/idmap.o \
-               lib/samba3/winsdb.o \
-               lib/samba3/samba3.o \
-               lib/samba3/group.o \
-               lib/samba3/registry.o \
-               lib/samba3/secrets.o \
-               lib/samba3/share_info.o
+               smbpasswd.o \
+               tdbsam.o \
+               policy.o \
+               idmap.o \
+               winsdb.o \
+               samba3.o \
+               group.o \
+               registry.o \
+               secrets.o \
+               share_info.o
 # End SUBSYSTEM LIBSAMBA3
 ################################################
index 13fe5843736a80f5c37618b2309cbc07367e314b..aa40975e4e0d25b1d83f48c385ced2295a5738b4 100644 (file)
@@ -4,7 +4,7 @@
 [MODULE::socket_ipv4]
 SUBSYSTEM = SOCKET
 INIT_OBJ_FILES = \
-               lib/socket/socket_ipv4.o
+               socket_ipv4.o
 NOPROTO=YES
 # End MODULE socket_ipv4
 ################################################
@@ -14,7 +14,7 @@ NOPROTO=YES
 [MODULE::socket_ipv6]
 SUBSYSTEM = SOCKET
 INIT_OBJ_FILES = \
-               lib/socket/socket_ipv6.o
+               socket_ipv6.o
 NOPROTO=YES
 # End MODULE socket_ipv6
 ################################################
@@ -24,7 +24,7 @@ NOPROTO=YES
 [MODULE::socket_unix]
 SUBSYSTEM = SOCKET
 INIT_OBJ_FILES = \
-               lib/socket/socket_unix.o
+               socket_unix.o
 NOPROTO=YES
 # End MODULE socket_unix
 ################################################
@@ -33,10 +33,10 @@ NOPROTO=YES
 # Start SUBSYSTEM SOCKET
 [SUBSYSTEM::SOCKET]
 INIT_OBJ_FILES = \
-               lib/socket/socket.o
+               socket.o
 ADD_OBJ_FILES = \
-               lib/socket/access.o \
-               lib/socket/connect.o
+               access.o \
+               connect.o
 NOPROTO=YES
 # End SUBSYSTEM SOCKET
 ################################################
index bc9a0951dcceadb7e99c15d94f90b35e73cfe278..ed9cf3eb1b1a013ce94c443ed7587475349b5dc3 100644 (file)
@@ -2,6 +2,6 @@
 # Start SUBSYSTEM SOCKET_WRAPPER
 [SUBSYSTEM::SOCKET_WRAPPER]
 NOPROTO = YES
-INIT_OBJ_FILES = lib/socket_wrapper/socket_wrapper.o
+INIT_OBJ_FILES = socket_wrapper.o
 # End SUBSYSTEM SOCKET_WRAPPER
 ##############################
index 7b47eacaf659ff43d33dfd9f8de2836a4ff8a1ba..1d5d957e9131b64cf4e8446a453f77542922e38e 100644 (file)
@@ -1,10 +1,10 @@
 ################################################
 # Start SUBSYSTEM LIBTALLOC
 [SUBSYSTEM::LIBTALLOC]
-INIT_OBJ_FILES = lib/talloc/talloc.o
+INIT_OBJ_FILES = talloc.o
 REQUIRED_SUBSYSTEMS = LIBREPLACE
 NOPROTO = YES
-MANPAGE = lib/talloc/talloc.3
+MANPAGE = talloc.3
 # End SUBSYSTEM LIBTALLOC
 ################################################
 
index bfc1900299094b5b4825c62b8a47d9fddc28e5fe..6c97c01b246c98bc725211878fc36fb1e94350e6 100644 (file)
@@ -2,10 +2,10 @@
 # Start SUBSYSTEM LIBTDB
 [SUBSYSTEM::LIBTDB]
 INIT_OBJ_FILES = \
-               lib/tdb/common/tdb.o
-ADD_OBJ_FILES = lib/tdb/common/dump.o lib/tdb/common/io.o lib/tdb/common/lock.o \
-       lib/tdb/common/open.o lib/tdb/common/traverse.o lib/tdb/common/freelist.o \
-       lib/tdb/common/error.o lib/tdb/common/transaction.o lib/tdb/common/tdbutil.o
+               common/tdb.o
+ADD_OBJ_FILES = common/dump.o common/io.o common/lock.o \
+       common/open.o common/traverse.o common/freelist.o \
+       common/error.o common/transaction.o common/tdbutil.o
 NOPROTO=YES
 REQUIRED_SUBSYSTEMS = \
                LIBREPLACE
@@ -31,7 +31,7 @@ REQUIRED_SUBSYSTEMS = \
 INSTALLDIR = BINDIR
 ENABLE = NO
 OBJ_FILES= \
-               lib/tdb/tools/tdbtool.o
+               tools/tdbtool.o
 REQUIRED_SUBSYSTEMS = \
                LIBTDB
 # End BINARY tdbtool
@@ -42,7 +42,7 @@ REQUIRED_SUBSYSTEMS = \
 [BINARY::tdbtorture]
 INSTALLDIR = BINDIR
 OBJ_FILES= \
-               lib/tdb/tools/tdbtorture.o
+               tools/tdbtorture.o
 REQUIRED_SUBSYSTEMS = \
                LIBTDB
 # End BINARY tdbtorture
@@ -53,7 +53,7 @@ REQUIRED_SUBSYSTEMS = \
 [BINARY::tdbdump]
 INSTALLDIR = BINDIR
 OBJ_FILES= \
-               lib/tdb/tools/tdbdump.o
+               tools/tdbdump.o
 REQUIRED_SUBSYSTEMS = \
                LIBTDB
 # End BINARY tdbdump
@@ -65,7 +65,7 @@ REQUIRED_SUBSYSTEMS = \
 INSTALLDIR = BINDIR
 ENABLE = NO
 OBJ_FILES= \
-               lib/tdb/tools/tdbbackup.o
+               tools/tdbbackup.o
 REQUIRED_SUBSYSTEMS = \
                LIBTDB
 # End BINARY tdbbackup
index 0800a698299f0028593aabf8cd795aafa66fe587..29d458acacbec63d7cfb43b7936599f972e83be8 100644 (file)
@@ -2,8 +2,8 @@
 # Start SUBSYSTEM LIBTLS
 [SUBSYSTEM::LIBTLS]
 ADD_OBJ_FILES = \
-               lib/tls/tls.o \
-               lib/tls/tlscert.o
+               tls.o \
+               tlscert.o
 REQUIRED_SUBSYSTEMS = \
                LIBTALLOC EXT_LIB_GNUTLS
 NOPROTO = YES
index 0c2e5f9d14ac375ce55a721a305467aaeb8b1105..c97bcd1e73e405bdea492ab8710d854500d0a597 100644 (file)
@@ -1,9 +1,9 @@
 #################################
 # Start SUBSYSTEM LIBCLI_AUTH
 [SUBSYSTEM::LIBCLI_AUTH]
-ADD_OBJ_FILES = libcli/auth/credentials.o \
-               libcli/auth/session.o \
-               libcli/auth/smbencrypt.o 
+ADD_OBJ_FILES = credentials.o \
+               session.o \
+               smbencrypt.o 
 REQUIRED_SUBSYSTEMS = \
                AUTH SCHANNELDB GENSEC
 # End SUBSYSTEM LIBCLI_AUTH
index 8b3920719421187b16d10b8c21bec7494ef5e06c..cf9695ec11bd34a437f4758b5b441cab4ec82643 100644 (file)
@@ -1,71 +1,75 @@
+include auth/config.mk
+include ldap/config.mk
+include security/config.mk
+
 [SUBSYSTEM::LIBCLI_UTILS]
-ADD_OBJ_FILES = libcli/util/asn1.o \
-               libcli/util/doserr.o \
-               libcli/util/errormap.o \
-               libcli/util/clierror.o \
-               libcli/util/nterr.o \
-               libcli/util/smbdes.o
+ADD_OBJ_FILES = util/asn1.o \
+               util/doserr.o \
+               util/errormap.o \
+               util/clierror.o \
+               util/nterr.o \
+               util/smbdes.o
 
 [SUBSYSTEM::LIBCLI_LSA]
-ADD_OBJ_FILES = libcli/util/clilsa.o
+ADD_OBJ_FILES = util/clilsa.o
 REQUIRED_SUBSYSTEMS = RPC_NDR_LSA
 
 [SUBSYSTEM::LIBCLI_COMPOSITE]
 ADD_OBJ_FILES = \
-       libcli/composite/composite.o
+       composite/composite.o
 REQUIRED_SUBSYSTEMS = LIBEVENTS
 
 [SUBSYSTEM::LIBCLI_SMB_COMPOSITE]
 ADD_OBJ_FILES = \
-       libcli/smb_composite/loadfile.o \
-       libcli/smb_composite/savefile.o \
-       libcli/smb_composite/connect.o \
-       libcli/smb_composite/connect_multi.o \
-       libcli/smb_composite/sesssetup.o \
-       libcli/smb_composite/fetchfile.o \
-       libcli/smb_composite/appendacl.o \
-       libcli/smb_composite/fsinfo.o 
+       smb_composite/loadfile.o \
+       smb_composite/savefile.o \
+       smb_composite/connect.o \
+       smb_composite/connect_multi.o \
+       smb_composite/sesssetup.o \
+       smb_composite/fetchfile.o \
+       smb_composite/appendacl.o \
+       smb_composite/fsinfo.o 
 REQUIRED_SUBSYSTEMS = LIBCLI_COMPOSITE
 
 [SUBSYSTEM::LIBCLI_NBT]
 ADD_OBJ_FILES = \
-       libcli/nbt/nbtname.o \
-       libcli/nbt/nbtsocket.o \
-       libcli/nbt/namequery.o \
-       libcli/nbt/nameregister.o \
-       libcli/nbt/namerefresh.o \
-       libcli/nbt/namerelease.o
+       nbt/nbtname.o \
+       nbt/nbtsocket.o \
+       nbt/namequery.o \
+       nbt/nameregister.o \
+       nbt/namerefresh.o \
+       nbt/namerelease.o
 REQUIRED_SUBSYSTEMS = NDR_RAW NDR_NBT SOCKET LIBCLI_COMPOSITE LIBEVENTS \
        LIB_SECURITY_NDR
 
 [SUBSYSTEM::LIBCLI_DGRAM]
 ADD_OBJ_FILES = \
-       libcli/dgram/dgramsocket.o \
-       libcli/dgram/mailslot.o \
-       libcli/dgram/netlogon.o \
-       libcli/dgram/ntlogon.o \
-       libcli/dgram/browse.o
+       dgram/dgramsocket.o \
+       dgram/mailslot.o \
+       dgram/netlogon.o \
+       dgram/ntlogon.o \
+       dgram/browse.o
 NOPROTO=YES
 REQUIRED_SUBSYSTEMS = LIBCLI_NBT
 
 [SUBSYSTEM::LIBCLI_CLDAP]
 ADD_OBJ_FILES = \
-       libcli/cldap/cldap.o
+       cldap/cldap.o
 NOPROTO=YES
 REQUIRED_SUBSYSTEMS = LIBCLI_LDAP
 
 [SUBSYSTEM::LIBCLI_WREPL]
 ADD_OBJ_FILES = \
-       libcli/wrepl/winsrepl.o
+       wrepl/winsrepl.o
 REQUIRED_SUBSYSTEMS = NDR_WINSREPL SOCKET LIBEVENTS
 
 [SUBSYSTEM::LIBCLI_RESOLVE]
 ADD_OBJ_FILES = \
-       libcli/resolve/resolve.o \
-       libcli/resolve/nbtlist.o \
-       libcli/resolve/bcast.o \
-       libcli/resolve/wins.o \
-       libcli/resolve/host.o
+       resolve/resolve.o \
+       resolve/nbtlist.o \
+       resolve/bcast.o \
+       resolve/wins.o \
+       resolve/host.o
 REQUIRED_SUBSYSTEMS = LIBCLI_NBT
 
 [SUBSYSTEM::LIBCLI]
@@ -75,34 +79,34 @@ REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBCLI_UTILS LIBCLI_AUTH \
 
 [SUBSYSTEM::LIBSMB]
 REQUIRED_SUBSYSTEMS = LIBCLI SOCKET
-ADD_OBJ_FILES = libcli/clireadwrite.o \
-               libcli/cliconnect.o \
-               libcli/clifile.o \
-               libcli/clilist.o \
-               libcli/clitrans2.o \
-               libcli/climessage.o \
-               libcli/clideltree.o
+ADD_OBJ_FILES = clireadwrite.o \
+               cliconnect.o \
+               clifile.o \
+               clilist.o \
+               clitrans2.o \
+               climessage.o \
+               clideltree.o
 
 [SUBSYSTEM::LIBCLI_RAW]
 REQUIRED_SUBSYSTEMS = LIBCLI_RAW_KRB5
-OBJ_FILES = libcli/raw/rawfile.o \
-               libcli/raw/smb_signing.o \
-               libcli/raw/clisocket.o \
-               libcli/raw/clitransport.o \
-               libcli/raw/clisession.o \
-               libcli/raw/clitree.o \
-               libcli/raw/rawrequest.o \
-               libcli/raw/rawreadwrite.o \
-               libcli/raw/rawsearch.o \
-               libcli/raw/rawsetfileinfo.o \
-               libcli/raw/raweas.o \
-               libcli/raw/rawtrans.o \
-               libcli/raw/clioplock.o \
-               libcli/raw/rawnegotiate.o \
-               libcli/raw/rawfsinfo.o \
-               libcli/raw/rawfileinfo.o \
-               libcli/raw/rawnotify.o \
-               libcli/raw/rawioctl.o \
-               libcli/raw/rawacl.o \
-               libcli/raw/rawdate.o \
-               libcli/raw/rawlpq.o
+OBJ_FILES = raw/rawfile.o \
+               raw/smb_signing.o \
+               raw/clisocket.o \
+               raw/clitransport.o \
+               raw/clisession.o \
+               raw/clitree.o \
+               raw/rawrequest.o \
+               raw/rawreadwrite.o \
+               raw/rawsearch.o \
+               raw/rawsetfileinfo.o \
+               raw/raweas.o \
+               raw/rawtrans.o \
+               raw/clioplock.o \
+               raw/rawnegotiate.o \
+               raw/rawfsinfo.o \
+               raw/rawfileinfo.o \
+               raw/rawnotify.o \
+               raw/rawioctl.o \
+               raw/rawacl.o \
+               raw/rawdate.o \
+               raw/rawlpq.o
index a92e73349342b1e9923202115a52473a7fbd514b..face7caa669da1e7a7ffd167f3fd1f72a1e4a754 100644 (file)
@@ -1,12 +1,12 @@
 #################################
 # Start SUBSYSTEM LIBCLI_LDAP
 [SUBSYSTEM::LIBCLI_LDAP]
-ADD_OBJ_FILES = libcli/ldap/ldap.o \
-               libcli/ldap/ldap_client.o \
-               libcli/ldap/ldap_bind.o \
-               libcli/ldap/ldap_msg.o \
-               libcli/ldap/ldap_ndr.o \
-               libcli/ldap/ldap_ildap.o
+ADD_OBJ_FILES = ldap.o \
+               ldap_client.o \
+               ldap_bind.o \
+               ldap_msg.o \
+               ldap_ndr.o \
+               ldap_ildap.o
 REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBEVENTS GENSEC SOCKET RPC_NDR_SAMR LIBTLS
 # End SUBSYSTEM LIBCLI_LDAP
 #################################
index 40987e37e2f7662085259112039ab6a0dd36ea8a..d7492038d3e7e847dc5aaba500d3f59668eab271 100644 (file)
@@ -1,14 +1,14 @@
 #################################
 # Start SUBSYSTEM LIB_SECURITY_NDR_HELPER
 [SUBSYSTEM::LIB_SECURITY_NDR_HELPER]
-ADD_OBJ_FILES = librpc/ndr/ndr_sec_helper.o
+ADD_OBJ_FILES = ../../librpc/ndr/ndr_sec_helper.o
 # End SUBSYSTEM LIB_SECURITY_NDR_HELPER
 #################################
 
 #################################
 # Start SUBSYSTEM LIB_SECURITY_NDR
 [SUBSYSTEM::LIB_SECURITY_NDR]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_security.o
+ADD_OBJ_FILES = ../../librpc/gen_ndr/ndr_security.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIB_SECURITY_NDR_HELPER
 # End SUBSYSTEM LIB_SECURITY_NDR
@@ -17,12 +17,12 @@ REQUIRED_SUBSYSTEMS = LIB_SECURITY_NDR_HELPER
 #################################
 # Start SUBSYSTEM LIB_SECURITY
 [SUBSYSTEM::LIB_SECURITY]
-ADD_OBJ_FILES = libcli/security/security_token.o \
-               libcli/security/security_descriptor.o \
-               libcli/security/dom_sid.o \
-               libcli/security/access_check.o \
-               libcli/security/privilege.o \
-               librpc/ndr/ndr_sec.o
+ADD_OBJ_FILES = security_token.o \
+               security_descriptor.o \
+               dom_sid.o \
+               access_check.o \
+               privilege.o \
+               ../../librpc/ndr/ndr_sec.o
 REQUIRED_SUBSYSTEMS = LIB_SECURITY_NDR
 # End SUBSYSTEM LIB_SECURITY
 #################################
index d9617982baba41f6af0bbc2650cd3d4686b95e39..f21f31cbaca5d867ac6edc2b81ee941942219e9b 100644 (file)
@@ -2,21 +2,21 @@
 # Start SUBSYSTEM LIBNET
 [SUBSYSTEM::LIBNET]
 INIT_OBJ_FILES = \
-               libnet/libnet.o
+               libnet.o
 ADD_OBJ_FILES = \
-               libnet/libnet_passwd.o \
-               libnet/libnet_time.o \
-               libnet/libnet_rpc.o \
-               libnet/libnet_join.o \
-               libnet/libnet_vampire.o \
-               libnet/libnet_samdump.o \
-               libnet/libnet_samsync_ldb.o \
-               libnet/libnet_user.o \
-               libnet/libnet_share.o \
-               libnet/libnet_lookup.o \
-               libnet/userinfo.o \
-               libnet/userman.o \
-               libnet/domain.o 
+               libnet_passwd.o \
+               libnet_time.o \
+               libnet_rpc.o \
+               libnet_join.o \
+               libnet_vampire.o \
+               libnet_samdump.o \
+               libnet_samsync_ldb.o \
+               libnet_user.o \
+               libnet_share.o \
+               libnet_lookup.o \
+               userinfo.o \
+               userman.o \
+               domain.o 
 REQUIRED_SUBSYSTEMS = RPC_NDR_SAMR RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBSAMBA3 LIBCLI_CLDAP
 # End SUBSYSTEM LIBNET
 #################################
index 356fb38bf207e37d0f17853983080df61085034a..29fe7c5a055075c459295f877f9e331497c2ef0a 100644 (file)
@@ -2,12 +2,12 @@
 # Start SUBSYSTEM NDR_RAW
 [SUBSYSTEM::NDR_RAW]
 INIT_OBJ_FILES = \
-               librpc/ndr/ndr.o
+               ndr/ndr.o
 ADD_OBJ_FILES = \
-               librpc/ndr/ndr_basic.o \
-               librpc/ndr/ndr_string.o \
-               librpc/ndr/ndr_obfuscate.o \
-               librpc/ndr/ndr_misc.o
+               ndr/ndr_basic.o \
+               ndr/ndr_string.o \
+               ndr/ndr_obfuscate.o \
+               ndr/ndr_misc.o
 REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBTALLOC
 # End SUBSYSTEM NDR_RAW
 ################################################
@@ -16,7 +16,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBTALLOC
 # Start SUBSYSTEM NDR_COMPRESSION
 [SUBSYSTEM::NDR_COMPRESSION]
 ADD_OBJ_FILES = \
-               librpc/ndr/ndr_compression.o
+               ndr/ndr_compression.o
 REQUIRED_SUBSYSTEMS = LIBCOMPRESSION
 # End SUBSYSTEM NDR_COMPRESSION
 ################################################
@@ -25,314 +25,314 @@ REQUIRED_SUBSYSTEMS = LIBCOMPRESSION
 # Start SUBSYSTEM RPC_RAW
 [SUBSYSTEM::RPC_RAW]
 INIT_OBJ_FILES = \
-               librpc/rpc/dcerpc.o
+               rpc/dcerpc.o
 ADD_OBJ_FILES = \
-               librpc/rpc/dcerpc_auth.o \
-               librpc/rpc/dcerpc_schannel.o \
-               librpc/rpc/dcerpc_util.o \
-               librpc/rpc/dcerpc_error.o \
-               librpc/rpc/dcerpc_smb.o \
-               librpc/rpc/dcerpc_sock.o
+               rpc/dcerpc_auth.o \
+               rpc/dcerpc_schannel.o \
+               rpc/dcerpc_util.o \
+               rpc/dcerpc_error.o \
+               rpc/dcerpc_smb.o \
+               rpc/dcerpc_sock.o
 REQUIRED_SUBSYSTEMS = SOCKET
 # End SUBSYSTEM RPC_RAW
 ################################################
 
 [SUBSYSTEM::NDR_AUDIOSRV]
 INIT_FUNCTION = dcerpc_audiosrv_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_audiosrv.o
+INIT_OBJ_FILES = gen_ndr/ndr_audiosrv.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_DCERPC]
 INIT_FUNCTION = dcerpc_dcerpc_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_dcerpc.o
+INIT_OBJ_FILES = gen_ndr/ndr_dcerpc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_ECHO]
 INIT_FUNCTION = dcerpc_echo_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_echo.o
+INIT_OBJ_FILES = gen_ndr/ndr_echo.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_IRPC]
 INIT_FUNCTION = dcerpc_irpc_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_irpc.o
+INIT_OBJ_FILES = gen_ndr/ndr_irpc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_EXCHANGE]
 INIT_FUNCTION = dcerpc_exchange_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_exchange.o
+INIT_OBJ_FILES = gen_ndr/ndr_exchange.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_DSBACKUP]
 INIT_FUNCTION = dcerpc_dsbackup_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_dsbackup.o
+INIT_OBJ_FILES = gen_ndr/ndr_dsbackup.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_EFS]
 INIT_FUNCTION = dcerpc_efs_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_efs.o
+INIT_OBJ_FILES = gen_ndr/ndr_efs.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_MISC]
 INIT_FUNCTION = dcerpc_misc_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_misc.o
+INIT_OBJ_FILES = gen_ndr/ndr_misc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_ROT]
 INIT_FUNCTION = dcerpc_rot_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_rot.o
+INIT_OBJ_FILES = gen_ndr/ndr_rot.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_LSA]
 INIT_FUNCTION = dcerpc_lsa_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_lsa.o
+INIT_OBJ_FILES = gen_ndr/ndr_lsa.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_DFS]
 INIT_FUNCTION = dcerpc_dfs_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_dfs.o
+INIT_OBJ_FILES = gen_ndr/ndr_dfs.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_DRSUAPI]
 INIT_FUNCTION = dcerpc_drsuapi_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_drsuapi.o
+INIT_OBJ_FILES = gen_ndr/ndr_drsuapi.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW NDR_DRSUAPI_PRINT NDR_COMPRESSION
 
 [SUBSYSTEM::NDR_DRSUAPI_PRINT]
-INIT_OBJ_FILES = librpc/ndr/ndr_drsuapi.o
+INIT_OBJ_FILES = ndr/ndr_drsuapi.o
 
 [SUBSYSTEM::NDR_DRSBLOBS]
 INIT_FUNCTION = dcerpc_drsblobs_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_drsblobs.o
+INIT_OBJ_FILES = gen_ndr/ndr_drsblobs.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_POLICYAGENT]
 INIT_FUNCTION = dcerpc_policyagent_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_policyagent.o
+INIT_OBJ_FILES = gen_ndr/ndr_policyagent.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_UNIXINFO]
 INIT_FUNCTION = dcerpc_unixinfo_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_unixinfo.o
+INIT_OBJ_FILES = gen_ndr/ndr_unixinfo.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_SAMR]
 INIT_FUNCTION = dcerpc_samr_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_samr.o
+INIT_OBJ_FILES = gen_ndr/ndr_samr.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_SPOOLSS]
 INIT_FUNCTION = dcerpc_spoolss_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_spoolss.o
+INIT_OBJ_FILES = gen_ndr/ndr_spoolss.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW NDR_SPOOLSS_BUF
 
 [SUBSYSTEM::NDR_SPOOLSS_BUF]
-INIT_OBJ_FILES = librpc/ndr/ndr_spoolss_buf.o
+INIT_OBJ_FILES = ndr/ndr_spoolss_buf.o
 
 [SUBSYSTEM::NDR_WKSSVC]
 INIT_FUNCTION = dcerpc_wkssvc_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_wkssvc.o
+INIT_OBJ_FILES = gen_ndr/ndr_wkssvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_SRVSVC]
 INIT_FUNCTION = dcerpc_srvsvc_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_srvsvc.o
+INIT_OBJ_FILES = gen_ndr/ndr_srvsvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW NDR_SVCCTL
 
 [SUBSYSTEM::NDR_SVCCTL]
 INIT_FUNCTION = dcerpc_svcctl_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_svcctl.o
+INIT_OBJ_FILES = gen_ndr/ndr_svcctl.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_ATSVC]
 INIT_FUNCTION = dcerpc_atsvc_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_atsvc.o
+INIT_OBJ_FILES = gen_ndr/ndr_atsvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_EVENTLOG]
 INIT_FUNCTION = dcerpc_eventlog_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_eventlog.o
+INIT_OBJ_FILES = gen_ndr/ndr_eventlog.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_EPMAPPER]
 INIT_FUNCTION = dcerpc_epmapper_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_epmapper.o
+INIT_OBJ_FILES = gen_ndr/ndr_epmapper.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_DBGIDL]
 INIT_FUNCTION = dcerpc_dbgidl_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_dbgidl.o
+INIT_OBJ_FILES = gen_ndr/ndr_dbgidl.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_DSSETUP]
 INIT_FUNCTION = dcerpc_dssetup_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_dssetup.o
+INIT_OBJ_FILES = gen_ndr/ndr_dssetup.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_MSGSVC]
 INIT_FUNCTION = dcerpc_msgsvc_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_msgsvc.o
+INIT_OBJ_FILES = gen_ndr/ndr_msgsvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_WINS]
 INIT_FUNCTION = dcerpc_wins_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_wins.o
+INIT_OBJ_FILES = gen_ndr/ndr_wins.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_WINREG]
 INIT_FUNCTION = dcerpc_winreg_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_winreg.o
+INIT_OBJ_FILES = gen_ndr/ndr_winreg.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW NDR_INITSHUTDOWN
 
 [SUBSYSTEM::NDR_INITSHUTDOWN]
 INIT_FUNCTION = dcerpc_initshutdown_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_initshutdown.o
+INIT_OBJ_FILES = gen_ndr/ndr_initshutdown.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_MGMT]
 INIT_FUNCTION = dcerpc_mgmt_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_mgmt.o
+INIT_OBJ_FILES = gen_ndr/ndr_mgmt.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_PROTECTED_STORAGE]
 INIT_FUNCTION = dcerpc_protected_storage_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_protected_storage.o
+INIT_OBJ_FILES = gen_ndr/ndr_protected_storage.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_DCOM]
 INIT_FUNCTION = dcerpc_dcom_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_dcom.o
+INIT_OBJ_FILES = gen_ndr/ndr_dcom.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW NDR_ORPC
 
 [SUBSYSTEM::NDR_ORPC_MANUAL]
-INIT_OBJ_FILES = librpc/ndr/ndr_orpc.o 
+INIT_OBJ_FILES = ndr/ndr_orpc.o 
 
 [SUBSYSTEM::NDR_ORPC]
 INIT_FUNCTION = dcerpc_orpc_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_orpc.o
+INIT_OBJ_FILES = gen_ndr/ndr_orpc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW NDR_ORPC_MANUAL
 
 [SUBSYSTEM::NDR_OXIDRESOLVER]
 INIT_FUNCTION = dcerpc_oxidresolver_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_oxidresolver.o
+INIT_OBJ_FILES = gen_ndr/ndr_oxidresolver.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW NDR_ORPC
 
 [SUBSYSTEM::NDR_REMACT]
 INIT_FUNCTION = dcerpc_remact_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_remact.o
+INIT_OBJ_FILES = gen_ndr/ndr_remact.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW NDR_ORPC
 
 [SUBSYSTEM::NDR_WZCSVC]
 INIT_FUNCTION = dcerpc_wzcsvc_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_wzcsvc.o
+INIT_OBJ_FILES = gen_ndr/ndr_wzcsvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_BROWSER]
 INIT_FUNCTION = dcerpc_browser_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_browser.o
+INIT_OBJ_FILES = gen_ndr/ndr_browser.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_W32TIME]
 INIT_FUNCTION = dcerpc_w32time_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_w32time.o
+INIT_OBJ_FILES = gen_ndr/ndr_w32time.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_SCERPC]
 INIT_FUNCTION = dcerpc_scerpc_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_scerpc.o
+INIT_OBJ_FILES = gen_ndr/ndr_scerpc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_NTSVCS]
 INIT_FUNCTION = dcerpc_ntsvcs_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_ntsvcs.o
+INIT_OBJ_FILES = gen_ndr/ndr_ntsvcs.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_NETLOGON]
 INIT_FUNCTION = dcerpc_netlogon_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_netlogon.o
+INIT_OBJ_FILES = gen_ndr/ndr_netlogon.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW NDR_SAMR
 
 [SUBSYSTEM::NDR_TRKWKS]
 INIT_FUNCTION = dcerpc_trkwks_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_trkwks.o
+INIT_OBJ_FILES = gen_ndr/ndr_trkwks.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_KEYSVC]
 INIT_FUNCTION = dcerpc_keysvc_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_keysvc.o
+INIT_OBJ_FILES = gen_ndr/ndr_keysvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_KRB5PAC]
 INIT_FUNCTION = dcerpc_krb5pac_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_krb5pac.o
+INIT_OBJ_FILES = gen_ndr/ndr_krb5pac.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW NDR_KRB5PAC_UTIL
 
 [SUBSYSTEM::NDR_KRB5PAC_UTIL]
-INIT_OBJ_FILES = librpc/ndr/ndr_krb5pac.o
+INIT_OBJ_FILES = ndr/ndr_krb5pac.o
 
 [SUBSYSTEM::NDR_XATTR]
 INIT_FUNCTION = dcerpc_xattr_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_xattr.o
+INIT_OBJ_FILES = gen_ndr/ndr_xattr.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_SCHANNEL]
 INIT_FUNCTION = dcerpc_schannel_init
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_schannel.o
+INIT_OBJ_FILES = gen_ndr/ndr_schannel.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_NBT]
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_nbt.o
+INIT_OBJ_FILES = gen_ndr/ndr_nbt.o
 INIT_FUNCTION = dcerpc_nbt_init
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW NDR_MISC
 
 [SUBSYSTEM::NDR_WINSREPL]
-INIT_OBJ_FILES = librpc/gen_ndr/ndr_winsrepl.o
+INIT_OBJ_FILES = gen_ndr/ndr_winsrepl.o
 INIT_FUNCTION = dcerpc_winsrepl_init
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_RAW NDR_NBT
@@ -350,197 +350,197 @@ REQUIRED_SUBSYSTEMS = NDR_AUDIOSRV NDR_ECHO NDR_DCERPC NDR_EXCHANGE \
        NDR_INITSHUTDOWN
 
 [SUBSYSTEM::RPC_NDR_ROT]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_rot_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_rot_c.o
 REQUIRED_SUBSYSTEMS = NDR_ROT RPC
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_AUDIOSRV]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_audiosrv_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_audiosrv_c.o
 REQUIRED_SUBSYSTEMS = NDR_AUDIOSRV RPC
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_ECHO]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_echo_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_echo_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_ECHO
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_EXCHANGE]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_exchange_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_exchange_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_EXCHANGE
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_DSBACKUP]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_dsbackup_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_dsbackup_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_DSBACKUP
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_EFS]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_efs_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_efs_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_EFS
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_LSA]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_lsa_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_lsa_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_LSA
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_DFS]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_dfs_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_dfs_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_DFS
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_DRSUAPI]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_drsuapi_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_drsuapi_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_DRSUAPI
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_DRSBLOBS]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_drsblobs_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_drsblobs_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_DRSBLOBS
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_POLICYAGENT]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_policyagent_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_policyagent_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_POLICYAGENT
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_UNIXINFO]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_unixinfo_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_unixinfo_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_UNIXINFO
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_SAMR]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_samr_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_samr_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_SAMR
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_SPOOLSS]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_spoolss_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_spoolss_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_SPOOLSS
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_WKSSVC]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_wkssvc_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_wkssvc_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_WKSSVC
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_SRVSVC]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_srvsvc_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_srvsvc_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_SRVSVC
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_SVCCTL]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_svcctl_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_svcctl_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_SVCCTL
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_ATSVC]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_atsvc_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_atsvc_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_ATSVC
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_EVENTLOG]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_eventlog_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_eventlog_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_EVENTLOG
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_EPMAPPER]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_epmapper_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_epmapper_c.o
 REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_DBGIDL]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_dbgidl_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_dbgidl_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_DBGIDL
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_DSSETUP]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_dssetup_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_dssetup_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_DSSETUP
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_MSGSVC]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_msgsvc_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_msgsvc_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_MSGSVC
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_WINS]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_wins_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_wins_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_WINS
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_WINREG]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_winreg_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_winreg_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_WINREG
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_INITSHUTDOWN]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_initshutdown_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_initshutdown_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_INITSHUTDOWN
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_MGMT]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_mgmt_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_mgmt_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_MGMT
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_PROTECTED_STORAGE]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_protected_storage_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_protected_storage_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_PROTECTED_STORAGE
 NOPROTO = YES
 
 [SUBSYSTEM::DCOM_PROXY_DCOM]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_dcom_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_dcom_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_DCOM
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_OXIDRESOLVER]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_oxidresolver_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_oxidresolver_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_OXIDRESOLVER
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_REMACT]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_remact_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_remact_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_REMACT
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_WZCSVC]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_wzcsvc_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_wzcsvc_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_WZCSVC
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_BROWSER]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_browser_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_browser_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_BROWSER
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_W32TIME]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_w32time_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_w32time_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_W32TIME
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_SCERPC]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_scerpc_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_scerpc_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_SCERPC
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_NTSVCS]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_ntsvcs_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_ntsvcs_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_NTSVCS
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_NETLOGON]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_netlogon_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_netlogon_c.o
 REQUIRED_SUBSYSTEMS = NDR_NETLOGON
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_TRKWKS]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_trkwks_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_trkwks_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_TRKWKS
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_KEYSVC]
-ADD_OBJ_FILES = librpc/gen_ndr/ndr_keysvc_c.o
+ADD_OBJ_FILES = gen_ndr/ndr_keysvc_c.o
 REQUIRED_SUBSYSTEMS = RPC NDR_KEYSVC
 NOPROTO = YES
 
@@ -553,97 +553,97 @@ REQUIRED_SUBSYSTEMS = NDR_RAW RPC_RAW LIBSMB NDR_MISC NDR_DCERPC NDR_SCHANNEL ND
 
 [SUBSYSTEM::RPC_EJS_ECHO]
 INIT_FUNCTION = ejs_init_rpcecho
-OBJ_FILES = librpc/gen_ndr/ndr_echo_ejs.o
+OBJ_FILES = gen_ndr/ndr_echo_ejs.o
 REQUIRED_SUBSYSTEMS = RPC NDR_ECHO
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_EJS_MISC]
 INIT_FUNCTION = ejs_init_misc
-OBJ_FILES = librpc/gen_ndr/ndr_misc_ejs.o
+OBJ_FILES = gen_ndr/ndr_misc_ejs.o
 REQUIRED_SUBSYSTEMS = RPC NDR_MISC
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_EJS_SAMR]
 INIT_FUNCTION = ejs_init_samr
-OBJ_FILES = librpc/gen_ndr/ndr_samr_ejs.o
+OBJ_FILES = gen_ndr/ndr_samr_ejs.o
 REQUIRED_SUBSYSTEMS = RPC NDR_SAMR
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_EJS_SECURITY]
 INIT_FUNCTION = ejs_init_security
-OBJ_FILES = librpc/gen_ndr/ndr_security_ejs.o
+OBJ_FILES = gen_ndr/ndr_security_ejs.o
 REQUIRED_SUBSYSTEMS = RPC LIB_SECURITY_NDR
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_EJS_LSA]
 INIT_FUNCTION = ejs_init_lsarpc
-OBJ_FILES = librpc/gen_ndr/ndr_lsa_ejs.o
+OBJ_FILES = gen_ndr/ndr_lsa_ejs.o
 REQUIRED_SUBSYSTEMS = RPC NDR_LSA
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_EJS_DFS]
 INIT_FUNCTION = ejs_init_dfs
-OBJ_FILES = librpc/gen_ndr/ndr_dfs_ejs.o
+OBJ_FILES = gen_ndr/ndr_dfs_ejs.o
 REQUIRED_SUBSYSTEMS = RPC NDR_DFS
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_EJS_DRSUAPI]
 INIT_FUNCTION = ejs_init_drsuapi
-OBJ_FILES = librpc/gen_ndr/ndr_drsuapi_ejs.o
+OBJ_FILES = gen_ndr/ndr_drsuapi_ejs.o
 REQUIRED_SUBSYSTEMS = RPC NDR_DRSUAPI
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_EJS_SPOOLSS]
 INIT_FUNCTION = ejs_init_spoolss
-OBJ_FILES = librpc/gen_ndr/ndr_spoolss_ejs.o
+OBJ_FILES = gen_ndr/ndr_spoolss_ejs.o
 REQUIRED_SUBSYSTEMS = RPC NDR_SPOOLSS
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_EJS_WKSSVC]
 INIT_FUNCTION = ejs_init_wkssvc
-OBJ_FILES = librpc/gen_ndr/ndr_wkssvc_ejs.o
+OBJ_FILES = gen_ndr/ndr_wkssvc_ejs.o
 REQUIRED_SUBSYSTEMS = RPC NDR_WKSSVC
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_EJS_SRVSVC]
 INIT_FUNCTION = ejs_init_srvsvc
-OBJ_FILES = librpc/gen_ndr/ndr_srvsvc_ejs.o
+OBJ_FILES = gen_ndr/ndr_srvsvc_ejs.o
 REQUIRED_SUBSYSTEMS = RPC NDR_SRVSVC
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_EJS_EVENTLOG]
 INIT_FUNCTION = ejs_init_eventlog
-OBJ_FILES = librpc/gen_ndr/ndr_eventlog_ejs.o
+OBJ_FILES = gen_ndr/ndr_eventlog_ejs.o
 REQUIRED_SUBSYSTEMS = RPC NDR_EVENTLOG
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_EJS_WINREG]
 INIT_FUNCTION = ejs_init_winreg
-OBJ_FILES = librpc/gen_ndr/ndr_winreg_ejs.o
+OBJ_FILES = gen_ndr/ndr_winreg_ejs.o
 REQUIRED_SUBSYSTEMS = RPC NDR_WINREG
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_EJS_INITSHUTDOWN]
 INIT_FUNCTION = ejs_init_initshutdown
-OBJ_FILES = librpc/gen_ndr/ndr_initshutdown_ejs.o
+OBJ_FILES = gen_ndr/ndr_initshutdown_ejs.o
 REQUIRED_SUBSYSTEMS = RPC NDR_INITSHUTDOWN
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_EJS_NETLOGON]
 INIT_FUNCTION = ejs_init_netlogon
-OBJ_FILES = librpc/gen_ndr/ndr_netlogon_ejs.o
+OBJ_FILES = gen_ndr/ndr_netlogon_ejs.o
 REQUIRED_SUBSYSTEMS = RPC NDR_NETLOGON
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_EJS_SVCCTL]
 INIT_FUNCTION = ejs_init_svcctl
-OBJ_FILES = librpc/gen_ndr/ndr_svcctl_ejs.o
+OBJ_FILES = gen_ndr/ndr_svcctl_ejs.o
 REQUIRED_SUBSYSTEMS = RPC NDR_SVCCTL
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_EJS_IRPC]
 INIT_FUNCTION = ejs_init_irpc
-OBJ_FILES = librpc/gen_ndr/ndr_irpc_ejs.o
+OBJ_FILES = gen_ndr/ndr_irpc_ejs.o
 REQUIRED_SUBSYSTEMS = RPC NDR_IRPC
 NOPROTO = YES
 
index 666639adfafe248c6d55145cd03668074cad75ec..998062285981f5bf49879cca0e95f2f5d29bd082 100644 (file)
@@ -9,20 +9,6 @@ include libnet/config.mk
 include auth/config.mk
 include nsswitch/config.mk
 include lib/basic.mk
-include lib/samba3/config.mk
-include lib/socket/config.mk
-include lib/charset/config.mk
-include lib/ldb/config.mk
-include lib/talloc/config.mk
-include lib/tdb/config.mk
-include lib/tls/config.mk
-include lib/registry/config.mk
-include lib/messaging/config.mk
-include lib/events/config.mk
-include lib/popt/config.mk
-include lib/cmdline/config.mk
-include lib/socket_wrapper/config.mk
-include lib/appweb/config.mk
 include param/config.mk
 include smb_server/config.mk
 include rpc_server/config.mk
@@ -32,29 +18,16 @@ include winbind/config.mk
 include nbt_server/config.mk
 include wrepl_server/config.mk
 include cldap_server/config.mk
-include auth/gensec/config.mk
-include auth/kerberos/config.mk
-include auth/ntlmssp/config.mk
-include auth/credentials/config.mk
-include libcli/auth/config.mk
-include libcli/ldap/config.mk
-include libcli/config.mk
 include utils/net/config.mk
 include utils/config.mk
-include ntvfs/posix/config.mk
 include ntvfs/config.mk
-include ntvfs/unixuid/config.mk
 include ntptr/config.mk
 include torture/config.mk
 include librpc/config.mk
 include client/config.mk
 include libcli/config.mk
-include libcli/security/config.mk
-include lib/com/config.mk
 include scripting/config.mk
 include kdc/config.mk
-include lib/replace/config.mk
-include scripting/ejs/config.mk
 
 all: binary_asn1_compile binary_compile_et binaries
 binaries: $(BIN_PROGS) $(SBIN_PROGS)
index 4d07897eb0db0cd8a4b67243184dbe7c8222878e..af5303bca126fdd17eebb70bd4d71db569bdb22d 100644 (file)
@@ -4,7 +4,7 @@
 # Start SUBSYSTEM WINSDB
 [SUBSYSTEM::WINSDB]
 ADD_OBJ_FILES = \
-               nbt_server/wins/winsdb.o
+               wins/winsdb.o
 REQUIRED_SUBSYSTEMS = \
                LIBLDB
 # End SUBSYSTEM WINSDB
@@ -14,9 +14,9 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM NBTD_WINS
 [SUBSYSTEM::NBTD_WINS]
 ADD_OBJ_FILES = \
-               nbt_server/wins/winsserver.o \
-               nbt_server/wins/winsclient.o \
-               nbt_server/wins/winswack.o
+               wins/winsserver.o \
+               wins/winsclient.o \
+               wins/winswack.o
 REQUIRED_SUBSYSTEMS = \
                LIBCLI_NBT WINSDB
 # End SUBSYSTEM NBTD_WINS
@@ -26,10 +26,10 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM NBTD_DGRAM
 [SUBSYSTEM::NBTD_DGRAM]
 ADD_OBJ_FILES = \
-               nbt_server/dgram/request.o \
-               nbt_server/dgram/netlogon.o \
-               nbt_server/dgram/ntlogon.o \
-               nbt_server/dgram/browse.o
+               dgram/request.o \
+               dgram/netlogon.o \
+               dgram/ntlogon.o \
+               dgram/browse.o
 REQUIRED_SUBSYSTEMS = \
                LIBCLI_DGRAM
 # End SUBSYSTEM NBTD_DGRAM
@@ -39,15 +39,15 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM NBTD
 [SUBSYSTEM::NBTD]
 INIT_OBJ_FILES = \
-               nbt_server/nbt_server.o
+               nbt_server.o
 ADD_OBJ_FILES = \
-               nbt_server/interfaces.o \
-               nbt_server/register.o \
-               nbt_server/query.o \
-               nbt_server/nodestatus.o \
-               nbt_server/defense.o \
-               nbt_server/packet.o \
-               nbt_server/irpc.o
+               interfaces.o \
+               register.o \
+               query.o \
+               nodestatus.o \
+               defense.o \
+               packet.o \
+               irpc.o
 REQUIRED_SUBSYSTEMS = \
                LIBCLI_NBT NBTD_WINS NBTD_DGRAM
 # End SUBSYSTEM NBTD
index 8b559d6205f97fb8f0fae05c6052b943ab9dc0ea..6572016c17ff9be70371e75506992cc096184bb5 100644 (file)
@@ -1,7 +1,7 @@
 #################################
 # Start SUBSYSTEM LIB_WINBIND_CLIENT
 [SUBSYSTEM::LIB_WINBIND_CLIENT]
-ADD_OBJ_FILES = nsswitch/wb_common.o
+ADD_OBJ_FILES = wb_common.o
 NOPROTO=YES
 # End SUBSYSTEM LIB_WINBIND_CLIENT
 #################################
index ab36d75343fd62fb0be0ac131eeaa33bb5fd338b..cbce1d66bd67d09b45c2170b688d10a418ac680c 100644 (file)
@@ -6,7 +6,7 @@
 INIT_FUNCTION = ntptr_simple_ldb_init
 SUBSYSTEM = NTPTR
 INIT_OBJ_FILES = \
-               ntptr/simple_ldb/ntptr_simple_ldb.o
+               simple_ldb/ntptr_simple_ldb.o
 REQUIRED_SUBSYSTEMS = \
                LIBLDB
 # End MODULE ntptr_simple_ldb
@@ -16,9 +16,9 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM NTPTR
 [SUBSYSTEM::NTPTR]
 INIT_OBJ_FILES = \
-               ntptr/ntptr_base.o
+               ntptr_base.o
 ADD_OBJ_FILES = \
-               ntptr/ntptr_interface.o
+               ntptr_interface.o
 #
 # End SUBSYSTEM NTPTR
 ################################################
index 55f8270de275adef63b0ce279b7466859990ebb9..a61c84770df591baf8928945ab77ab1b3b88d506 100644 (file)
@@ -1,4 +1,6 @@
 # NTVFS Server subsystem
+include posix/config.mk
+include unixuid/config.mk
 
 ################################################
 # Start MODULE ntvfs_cifs
@@ -6,7 +8,7 @@
 INIT_FUNCTION = ntvfs_cifs_init 
 SUBSYSTEM = NTVFS
 INIT_OBJ_FILES = \
-               ntvfs/cifs/vfs_cifs.o
+               cifs/vfs_cifs.o
 REQUIRED_SUBSYSTEMS = \
                LIBCLI
 # End MODULE ntvfs_cifs
@@ -18,9 +20,9 @@ REQUIRED_SUBSYSTEMS = \
 INIT_FUNCTION = ntvfs_simple_init 
 SUBSYSTEM = NTVFS
 INIT_OBJ_FILES = \
-               ntvfs/simple/vfs_simple.o
+               simple/vfs_simple.o
 ADD_OBJ_FILES = \
-               ntvfs/simple/svfs_util.o
+               simple/svfs_util.o
 # End MODULE ntvfs_cifs
 ################################################
 
@@ -30,7 +32,7 @@ ADD_OBJ_FILES = \
 INIT_FUNCTION = ntvfs_print_init 
 SUBSYSTEM = NTVFS
 INIT_OBJ_FILES = \
-               ntvfs/print/vfs_print.o
+               print/vfs_print.o
 # End MODULE ntvfs_print
 ################################################
 
@@ -40,9 +42,9 @@ INIT_OBJ_FILES = \
 SUBSYSTEM = NTVFS
 INIT_FUNCTION = ntvfs_ipc_init 
 INIT_OBJ_FILES = \
-               ntvfs/ipc/vfs_ipc.o \
-               ntvfs/ipc/ipc_rap.o \
-               ntvfs/ipc/rap_server.o
+               ipc/vfs_ipc.o \
+               ipc/ipc_rap.o \
+               ipc/rap_server.o
 # End MODULE ntvfs_ipc
 ################################################
 
@@ -54,7 +56,7 @@ INIT_OBJ_FILES = \
 SUBSYSTEM = NTVFS
 INIT_FUNCTION = ntvfs_nbench_init 
 INIT_OBJ_FILES = \
-               ntvfs/nbench/vfs_nbench.o
+               nbench/vfs_nbench.o
 # End MODULE ntvfs_nbench
 ################################################
 
@@ -62,9 +64,9 @@ INIT_OBJ_FILES = \
 # Start SUBSYSTEM ntvfs_common
 [SUBSYSTEM::ntvfs_common]
 ADD_OBJ_FILES = \
-               ntvfs/common/brlock.o \
-               ntvfs/common/opendb.o \
-               ntvfs/common/sidmap.o
+               common/brlock.o \
+               common/opendb.o \
+               common/sidmap.o
 # End SUBSYSTEM ntvfs_common
 ################################################
 
@@ -73,11 +75,11 @@ ADD_OBJ_FILES = \
 # Start SUBSYSTEM NTVFS
 [SUBSYSTEM::NTVFS]
 INIT_OBJ_FILES = \
-               ntvfs/ntvfs_base.o
+               ntvfs_base.o
 ADD_OBJ_FILES = \
-               ntvfs/ntvfs_generic.o \
-               ntvfs/ntvfs_interface.o \
-               ntvfs/ntvfs_util.o
+               ntvfs_generic.o \
+               ntvfs_interface.o \
+               ntvfs_util.o
 #
 # End SUBSYSTEM NTVFS
 ################################################
index 9be37230562a65bd47986fbfd31afe3d0f95c470..cf406890c9396e3121a5b0d3a1955d304b58a8a7 100644 (file)
@@ -4,33 +4,33 @@
 SUBSYSTEM = NTVFS
 INIT_FUNCTION = ntvfs_posix_init 
 INIT_OBJ_FILES = \
-               ntvfs/posix/vfs_posix.o
+               vfs_posix.o
 ADD_OBJ_FILES = \
-               ntvfs/posix/pvfs_util.o \
-               ntvfs/posix/pvfs_search.o \
-               ntvfs/posix/pvfs_dirlist.o \
-               ntvfs/posix/pvfs_fileinfo.o \
-               ntvfs/posix/pvfs_unlink.o \
-               ntvfs/posix/pvfs_mkdir.o \
-               ntvfs/posix/pvfs_open.o \
-               ntvfs/posix/pvfs_read.o \
-               ntvfs/posix/pvfs_flush.o \
-               ntvfs/posix/pvfs_write.o \
-               ntvfs/posix/pvfs_fsinfo.o \
-               ntvfs/posix/pvfs_qfileinfo.o \
-               ntvfs/posix/pvfs_setfileinfo.o \
-               ntvfs/posix/pvfs_rename.o \
-               ntvfs/posix/pvfs_resolve.o \
-               ntvfs/posix/pvfs_shortname.o \
-               ntvfs/posix/pvfs_lock.o \
-               ntvfs/posix/pvfs_wait.o \
-               ntvfs/posix/pvfs_seek.o \
-               ntvfs/posix/pvfs_ioctl.o \
-               ntvfs/posix/pvfs_xattr.o \
-               ntvfs/posix/pvfs_streams.o \
-               ntvfs/posix/pvfs_acl.o \
-               ntvfs/posix/xattr_system.o \
-               ntvfs/posix/xattr_tdb.o
+               pvfs_util.o \
+               pvfs_search.o \
+               pvfs_dirlist.o \
+               pvfs_fileinfo.o \
+               pvfs_unlink.o \
+               pvfs_mkdir.o \
+               pvfs_open.o \
+               pvfs_read.o \
+               pvfs_flush.o \
+               pvfs_write.o \
+               pvfs_fsinfo.o \
+               pvfs_qfileinfo.o \
+               pvfs_setfileinfo.o \
+               pvfs_rename.o \
+               pvfs_resolve.o \
+               pvfs_shortname.o \
+               pvfs_lock.o \
+               pvfs_wait.o \
+               pvfs_seek.o \
+               pvfs_ioctl.o \
+               pvfs_xattr.o \
+               pvfs_streams.o \
+               pvfs_acl.o \
+               xattr_system.o \
+               xattr_tdb.o
 REQUIRED_SUBSYSTEMS = NDR_XATTR ntvfs_common EXT_LIB_XATTR EXT_LIB_BLKID
 # End MODULE ntvfs_posix
 ################################################
index 34c8f0c2b4962ee3623cb3b13bd90e3a003bb215..b9c800038467ee66d5478f37f8f90379e2d5f278 100644 (file)
@@ -4,7 +4,7 @@
 INIT_FUNCTION = ntvfs_unixuid_init
 SUBSYSTEM = NTVFS
 INIT_OBJ_FILES = \
-               ntvfs/unixuid/vfs_unixuid.o
+               vfs_unixuid.o
 REQUIRED_SUBSYSTEMS = \
                ntvfs_common
 # End MODULE ntvfs_unixuid
index 5126f7cd52aceb6fb448fbc6603789bd6fbe197e..59485838314d6c710833ca34299c9f5ab89983e4 100644 (file)
@@ -1,6 +1,6 @@
 [SUBSYSTEM::CONFIG]
-INIT_OBJ_FILES = dynconfig.o
-ADD_OBJ_FILES = param/loadparm.o \
-                               param/params.o \
-                               passdb/secrets.o \
-                               param/generic.o
+INIT_OBJ_FILES = ../dynconfig.o
+ADD_OBJ_FILES = loadparm.o \
+                               params.o \
+                               ../passdb/secrets.o \
+                               generic.o
index 4ff51263222463609fdafbdfe55f85cc0da74aa0..1d6913c40b363ac1155965d6b334365a53526a6f 100644 (file)
@@ -4,8 +4,8 @@
 # Start SUBSYSTEM DCERPC_COMMON
 [SUBSYSTEM::DCERPC_COMMON]
 ADD_OBJ_FILES = \
-               rpc_server/common/server_info.o \
-               rpc_server/common/share_info.o
+               common/server_info.o \
+               common/share_info.o
 #
 # End SUBSYSTEM DCERPC_COMMON
 ################################################
@@ -17,10 +17,10 @@ ENABLE = NO
 INIT_FUNCTION = dcerpc_server_dcom_init
 SUBSYSTEM = DCERPC
 INIT_OBJ_FILES = \
-               rpc_server/dcom/oxidresolver.o \
-               rpc_server/dcom/rot.o \
-               rpc_server/dcom/rodb.o \
-               rpc_server/dcom/remact.o \
+               dcom/oxidresolver.o \
+               dcom/rot.o \
+               dcom/rodb.o \
+               dcom/remact.o \
                librpc/gen_ndr/ndr_dcom_d.o
 REQUIRED_SUBSYSTEMS = \
                DCERPC_COMMON \
@@ -34,7 +34,7 @@ REQUIRED_SUBSYSTEMS = \
 INIT_FUNCTION = dcerpc_server_rpcecho_init
 SUBSYSTEM = DCERPC
 INIT_OBJ_FILES = \
-               rpc_server/echo/rpc_echo.o
+               echo/rpc_echo.o
 REQUIRED_SUBSYSTEMS = NDR_ECHO
 # End MODULE dcerpc_rpcecho
 ################################################
@@ -45,7 +45,7 @@ REQUIRED_SUBSYSTEMS = NDR_ECHO
 INIT_FUNCTION = dcerpc_server_epmapper_init
 SUBSYSTEM = DCERPC
 INIT_OBJ_FILES = \
-               rpc_server/epmapper/rpc_epmapper.o
+               epmapper/rpc_epmapper.o
 REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
 # End MODULE dcerpc_epmapper
 ################################################
@@ -56,7 +56,7 @@ REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
 INIT_FUNCTION = dcerpc_server_remote_init
 SUBSYSTEM = DCERPC
 INIT_OBJ_FILES = \
-               rpc_server/remote/dcesrv_remote.o
+               remote/dcesrv_remote.o
 REQUIRED_SUBSYSTEMS = \
                LIBSMB NDR_ALL
 # End MODULE dcerpc_remote
@@ -68,7 +68,7 @@ REQUIRED_SUBSYSTEMS = \
 INIT_FUNCTION = dcerpc_server_srvsvc_init
 SUBSYSTEM = DCERPC
 INIT_OBJ_FILES = \
-               rpc_server/srvsvc/dcesrv_srvsvc.o
+               srvsvc/dcesrv_srvsvc.o
 REQUIRED_SUBSYSTEMS = \
                DCERPC_COMMON NDR_SRVSVC
 # End MODULE dcerpc_srvsvc
@@ -80,7 +80,7 @@ REQUIRED_SUBSYSTEMS = \
 INIT_FUNCTION = dcerpc_server_wkssvc_init
 SUBSYSTEM = DCERPC
 INIT_OBJ_FILES = \
-               rpc_server/wkssvc/dcesrv_wkssvc.o
+               wkssvc/dcesrv_wkssvc.o
 REQUIRED_SUBSYSTEMS = \
                DCERPC_COMMON NDR_WKSSVC
 # End MODULE dcerpc_wkssvc
@@ -92,7 +92,7 @@ REQUIRED_SUBSYSTEMS = \
 INIT_FUNCTION = dcerpc_server_unixinfo_init
 SUBSYSTEM = DCERPC
 INIT_OBJ_FILES = \
-               rpc_server/unixinfo/dcesrv_unixinfo.o
+               unixinfo/dcesrv_unixinfo.o
 REQUIRED_SUBSYSTEMS = \
                DCERPC_COMMON \
                NDR_UNIXINFO
@@ -105,9 +105,9 @@ REQUIRED_SUBSYSTEMS = \
 INIT_FUNCTION = dcerpc_server_samr_init
 SUBSYSTEM = DCERPC
 INIT_OBJ_FILES = \
-               rpc_server/samr/dcesrv_samr.o
+               samr/dcesrv_samr.o
 ADD_OBJ_FILES = \
-               rpc_server/samr/samr_password.o
+               samr/samr_password.o
 REQUIRED_SUBSYSTEMS = \
                SAMDB \
                DCERPC_COMMON \
@@ -121,7 +121,7 @@ REQUIRED_SUBSYSTEMS = \
 INIT_FUNCTION = dcerpc_server_winreg_init
 SUBSYSTEM = DCERPC
 INIT_OBJ_FILES = \
-               rpc_server/winreg/rpc_winreg.o
+               winreg/rpc_winreg.o
 REQUIRED_SUBSYSTEMS = \
                REGISTRY NDR_WINREG
 # End MODULE dcerpc_winreg
@@ -133,7 +133,7 @@ REQUIRED_SUBSYSTEMS = \
 INIT_FUNCTION = dcerpc_server_netlogon_init
 SUBSYSTEM = DCERPC
 INIT_OBJ_FILES = \
-               rpc_server/netlogon/dcerpc_netlogon.o
+               netlogon/dcerpc_netlogon.o
 REQUIRED_SUBSYSTEMS = \
                DCERPC_COMMON \
                SCHANNELDB \
@@ -147,7 +147,7 @@ REQUIRED_SUBSYSTEMS = \
 INIT_FUNCTION = dcerpc_server_lsarpc_init
 SUBSYSTEM = DCERPC
 INIT_OBJ_FILES = \
-               rpc_server/lsa/dcesrv_lsa.o
+               lsa/dcesrv_lsa.o
 REQUIRED_SUBSYSTEMS = \
                SAMDB \
                DCERPC_COMMON \
@@ -161,7 +161,7 @@ REQUIRED_SUBSYSTEMS = \
 INIT_FUNCTION = dcerpc_server_spoolss_init
 SUBSYSTEM = DCERPC
 INIT_OBJ_FILES = \
-               rpc_server/spoolss/dcesrv_spoolss.o
+               spoolss/dcesrv_spoolss.o
 REQUIRED_SUBSYSTEMS = \
                DCERPC_COMMON \
                NDR_SPOOLSS \
@@ -175,9 +175,9 @@ REQUIRED_SUBSYSTEMS = \
 INIT_FUNCTION = dcerpc_server_drsuapi_init
 SUBSYSTEM = DCERPC
 INIT_OBJ_FILES = \
-               rpc_server/drsuapi/dcesrv_drsuapi.o
+               drsuapi/dcesrv_drsuapi.o
 ADD_OBJ_FILES = \
-               rpc_server/drsuapi/drsuapi_cracknames.o
+               drsuapi/drsuapi_cracknames.o
 REQUIRED_SUBSYSTEMS = \
                SAMDB \
                DCERPC_COMMON \
@@ -191,7 +191,7 @@ REQUIRED_SUBSYSTEMS = \
 INIT_FUNCTION = dcerpc_server_dssetup_init
 SUBSYSTEM = DCERPC
 INIT_OBJ_FILES = \
-               rpc_server/dssetup/dcesrv_dssetup.o
+               dssetup/dcesrv_dssetup.o
 REQUIRED_SUBSYSTEMS = \
                SAMDB \
                DCERPC_COMMON \
@@ -203,11 +203,11 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM DCERPC
 [SUBSYSTEM::DCERPC]
 INIT_OBJ_FILES = \
-               rpc_server/dcerpc_server.o
+               dcerpc_server.o
 ADD_OBJ_FILES = \
-               rpc_server/dcerpc_sock.o \
-               rpc_server/dcesrv_auth.o \
-               rpc_server/handles.o
+               dcerpc_sock.o \
+               dcesrv_auth.o \
+               handles.o
 REQUIRED_SUBSYSTEMS = \
                LIBCLI_AUTH \
                NDR_RAW
index 9e6be54457ced563ad06d26c6d3706068f10b840..69a5dd4efe1d089aa1ea863614305346bbae5743 100644 (file)
@@ -1,3 +1,5 @@
+include ejs/config.mk
+
 #######################
 # Start LIBRARY swig_tdb
 [LIBRARY::swig_tdb]
index b997a656ab5d951f0024c46f1c627797e141dcdf..a53c378e9dffa8ebdb1a4b0306a0d58f4a21edf5 100644 (file)
@@ -2,7 +2,7 @@
 # Start LIBRARY EJSRPC
 [SUBSYSTEM::EJSRPC]
 OBJ_FILES = \
-               scripting/ejs/ejsrpc.o
+               ejsrpc.o
 REQUIRED_SUBSYSTEMS = RPC_EJS
 NOPROTO = YES
 # End SUBSYSTEM EJSRPC
@@ -12,23 +12,23 @@ NOPROTO = YES
 # Start LIBRARY SMBCALLS
 [SUBSYSTEM::SMBCALLS]
 OBJ_FILES = \
-               scripting/ejs/smbcalls.o \
-               scripting/ejs/smbcalls_config.o \
-               scripting/ejs/smbcalls_ldb.o \
-               scripting/ejs/smbcalls_nbt.o \
-               scripting/ejs/smbcalls_cli.o \
-               scripting/ejs/smbcalls_rpc.o \
-               scripting/ejs/smbcalls_auth.o \
-               scripting/ejs/smbcalls_options.o \
-               scripting/ejs/smbcalls_nss.o \
-               scripting/ejs/smbcalls_string.o \
-               scripting/ejs/smbcalls_data.o \
-               scripting/ejs/smbcalls_rand.o \
-               scripting/ejs/smbcalls_sys.o \
-               scripting/ejs/smbcalls_creds.o \
-               scripting/ejs/smbcalls_samba3.o \
-               scripting/ejs/smbcalls_param.o \
-               scripting/ejs/mprutil.o
+               smbcalls.o \
+               smbcalls_config.o \
+               smbcalls_ldb.o \
+               smbcalls_nbt.o \
+               smbcalls_cli.o \
+               smbcalls_rpc.o \
+               smbcalls_auth.o \
+               smbcalls_options.o \
+               smbcalls_nss.o \
+               smbcalls_string.o \
+               smbcalls_data.o \
+               smbcalls_rand.o \
+               smbcalls_sys.o \
+               smbcalls_creds.o \
+               smbcalls_samba3.o \
+               smbcalls_param.o \
+               mprutil.o
 REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3
 # End SUBSYSTEM SMBCALLS
 #######################
@@ -38,7 +38,7 @@ REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3
 [BINARY::smbscript]
 INSTALLDIR = BINDIR
 OBJ_FILES = \
-               scripting/ejs/smbscript.o
+               smbscript.o
 REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG LIBSMB RPC LIBCMDLINE
 # End BINARY SMBSCRIPT
 #######################
index d9616939389d79a24ca699eb94a16ee3463bf271..03a49d728a72fb05ac82cec26b5b395c85e7f168 100644 (file)
@@ -4,21 +4,21 @@
 # Start SUBSYSTEM SMB
 [SUBSYSTEM::SMB]
 INIT_OBJ_FILES = \
-               smb_server/smb_server.o
+               smb_server.o
 ADD_OBJ_FILES = \
-               smb_server/conn.o \
-               smb_server/negprot.o \
-               smb_server/nttrans.o \
-               smb_server/session.o \
-               smb_server/reply.o \
-               smb_server/request.o \
-               smb_server/search.o \
-               smb_server/service.o \
-               smb_server/sesssetup.o \
-               smb_server/srvtime.o \
-               smb_server/trans2.o \
-               smb_server/signing.o \
-               smb_server/management.o
+               conn.o \
+               negprot.o \
+               nttrans.o \
+               session.o \
+               reply.o \
+               request.o \
+               search.o \
+               service.o \
+               sesssetup.o \
+               srvtime.o \
+               trans2.o \
+               signing.o \
+               management.o
 REQUIRED_SUBSYSTEMS = \
                NTVFS
 # End SUBSYSTEM SMB
index 2f78232a0c5a7075fab2668f904a4d24973db5bf..7997171225f116bd1d61aa8ff9311acdff8c0501 100644 (file)
@@ -94,9 +94,9 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM SERVICE
 [SUBSYSTEM::SERVER_SERVICE]
 INIT_OBJ_FILES = \
-               smbd/service.o \
-               smbd/service_stream.o \
-               smbd/service_task.o
+               service.o \
+               service_stream.o \
+               service_task.o
 REQUIRED_SUBSYSTEMS = \
                MESSAGING
 # End SUBSYSTEM SERVER
@@ -107,7 +107,7 @@ REQUIRED_SUBSYSTEMS = \
 [BINARY::smbd]
 INSTALLDIR = SBINDIR
 OBJ_FILES = \
-               smbd/server.o
+               server.o
 REQUIRED_SUBSYSTEMS = \
                PROCESS_MODEL \
                SERVER_SERVICE \
index f110cbb8fafa2d7b19815408323b0a6abb09df5b..2e71a8fb7ad6f39b56a277d8e05883c59272cf1f 100644 (file)
@@ -6,7 +6,7 @@
 INIT_FUNCTION = process_model_single_init 
 SUBSYSTEM = PROCESS_MODEL
 INIT_OBJ_FILES = \
-               smbd/process_single.o
+               process_single.o
 # End MODULE process_model_single
 ################################################
 
@@ -16,7 +16,7 @@ INIT_OBJ_FILES = \
 INIT_FUNCTION = process_model_standard_init 
 SUBSYSTEM = PROCESS_MODEL
 INIT_OBJ_FILES = \
-               smbd/process_standard.o
+               process_standard.o
 # End MODULE process_model_standard
 ################################################
 
@@ -26,7 +26,7 @@ INIT_OBJ_FILES = \
 INIT_FUNCTION = process_model_thread_init 
 SUBSYSTEM = PROCESS_MODEL
 INIT_OBJ_FILES = \
-               smbd/process_thread.o
+               process_thread.o
 REQUIRED_SUBSYSTEMS = EXT_LIB_PTHREAD
 # End MODULE process_model_thread
 ################################################
@@ -35,7 +35,7 @@ REQUIRED_SUBSYSTEMS = EXT_LIB_PTHREAD
 # Start SUBSYSTEM PROCESS_MODEL
 [SUBSYSTEM::PROCESS_MODEL]
 INIT_OBJ_FILES = \
-               smbd/process_model.o
+               process_model.o
 #
 # End SUBSYSTEM PROCESS_MODEL
 ################################################
index ec60dbbe55b8046d3a4339a86fc72b20a51ce422..5c0105c3e2d6be79e909e3e668b8c05b00eb15ff 100644 (file)
@@ -4,22 +4,22 @@
 # Start SUBSYSTEM TORTURE_BASIC
 [SUBSYSTEM::TORTURE_BASIC]
 ADD_OBJ_FILES = \
-               torture/basic/scanner.o \
-               torture/basic/utable.o \
-               torture/basic/charset.o \
-               torture/basic/mangle_test.o \
-               torture/basic/denytest.o \
-               torture/basic/aliases.o \
-               torture/basic/locking.o \
-               torture/basic/secleak.o \
-               torture/basic/rename.o \
-               torture/basic/dir.o \
-               torture/basic/delete.o \
-               torture/basic/unlink.o \
-               torture/basic/disconnect.o \
-               torture/basic/delaywrite.o \
-               torture/basic/attr.o \
-               torture/basic/properties.o 
+               basic/scanner.o \
+               basic/utable.o \
+               basic/charset.o \
+               basic/mangle_test.o \
+               basic/denytest.o \
+               basic/aliases.o \
+               basic/locking.o \
+               basic/secleak.o \
+               basic/rename.o \
+               basic/dir.o \
+               basic/delete.o \
+               basic/unlink.o \
+               basic/disconnect.o \
+               basic/delaywrite.o \
+               basic/attr.o \
+               basic/properties.o 
 REQUIRED_SUBSYSTEMS = \
                LIBSMB 
 # End SUBSYSTEM TORTURE_BASIC
@@ -29,29 +29,29 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM TORTURE_BASIC
 [SUBSYSTEM::TORTURE_RAW]
 ADD_OBJ_FILES = \
-               torture/raw/qfsinfo.o \
-               torture/raw/qfileinfo.o \
-               torture/raw/setfileinfo.o \
-               torture/raw/search.o \
-               torture/raw/close.o \
-               torture/raw/open.o \
-               torture/raw/mkdir.o \
-               torture/raw/oplock.o \
-               torture/raw/notify.o \
-               torture/raw/mux.o \
-               torture/raw/ioctl.o \
-               torture/raw/chkpath.o \
-               torture/raw/unlink.o \
-               torture/raw/read.o \
-               torture/raw/context.o \
-               torture/raw/write.o \
-               torture/raw/lock.o \
-               torture/raw/rename.o \
-               torture/raw/eas.o \
-               torture/raw/streams.o \
-               torture/raw/acls.o \
-               torture/raw/seek.o \
-               torture/raw/composite.o
+               raw/qfsinfo.o \
+               raw/qfileinfo.o \
+               raw/setfileinfo.o \
+               raw/search.o \
+               raw/close.o \
+               raw/open.o \
+               raw/mkdir.o \
+               raw/oplock.o \
+               raw/notify.o \
+               raw/mux.o \
+               raw/ioctl.o \
+               raw/chkpath.o \
+               raw/unlink.o \
+               raw/read.o \
+               raw/context.o \
+               raw/write.o \
+               raw/lock.o \
+               raw/rename.o \
+               raw/eas.o \
+               raw/streams.o \
+               raw/acls.o \
+               raw/seek.o \
+               raw/composite.o
 REQUIRED_SUBSYSTEMS = \
                LIBSMB LIBCLI_LSA
 # End SUBSYSTEM TORTURE_RAW
@@ -61,7 +61,7 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM TORTURE_COM
 [SUBSYSTEM::TORTURE_COM]
 ADD_OBJ_FILES = \
-               torture/com/simple.o
+               com/simple.o
 REQUIRED_SUBSYSTEMS = \
                COM DCOM
 # End SUBSYSTEM TORTURE_COM
@@ -71,43 +71,43 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM TORTURE_RPC
 [SUBSYSTEM::TORTURE_RPC]
 ADD_OBJ_FILES = \
-               torture/rpc/join.o \
-               torture/rpc/lsa.o \
-               torture/rpc/session_key.o \
-               torture/rpc/echo.o \
-               torture/rpc/dcom.o \
-               torture/rpc/dfs.o \
-               torture/rpc/drsuapi.o \
-               torture/rpc/drsuapi_cracknames.o \
-               torture/rpc/dssync.o \
-               torture/rpc/spoolss.o \
-               torture/rpc/unixinfo.o \
-               torture/rpc/samr.o \
-               torture/rpc/wkssvc.o \
-               torture/rpc/srvsvc.o \
-               torture/rpc/svcctl.o \
-               torture/rpc/atsvc.o \
-               torture/rpc/eventlog.o \
-               torture/rpc/epmapper.o \
-               torture/rpc/winreg.o \
-               torture/rpc/initshutdown.o \
-               torture/rpc/oxidresolve.o \
-               torture/rpc/remact.o \
-               torture/rpc/mgmt.o \
-               torture/rpc/scanner.o \
-               torture/rpc/autoidl.o \
-               torture/rpc/countcalls.o \
-               torture/rpc/testjoin.o \
-               torture/rpc/xplogin.o \
-               torture/rpc/schannel.o \
-               torture/rpc/netlogon.o \
-               torture/rpc/samlogon.o \
-               torture/rpc/samsync.o \
-               torture/rpc/rot.o \
-               torture/rpc/bind.o \
-               torture/rpc/dssetup.o \
-               torture/rpc/alter_context.o \
-               torture/rpc/bench.o
+               rpc/join.o \
+               rpc/lsa.o \
+               rpc/session_key.o \
+               rpc/echo.o \
+               rpc/dcom.o \
+               rpc/dfs.o \
+               rpc/drsuapi.o \
+               rpc/drsuapi_cracknames.o \
+               rpc/dssync.o \
+               rpc/spoolss.o \
+               rpc/unixinfo.o \
+               rpc/samr.o \
+               rpc/wkssvc.o \
+               rpc/srvsvc.o \
+               rpc/svcctl.o \
+               rpc/atsvc.o \
+               rpc/eventlog.o \
+               rpc/epmapper.o \
+               rpc/winreg.o \
+               rpc/initshutdown.o \
+               rpc/oxidresolve.o \
+               rpc/remact.o \
+               rpc/mgmt.o \
+               rpc/scanner.o \
+               rpc/autoidl.o \
+               rpc/countcalls.o \
+               rpc/testjoin.o \
+               rpc/xplogin.o \
+               rpc/schannel.o \
+               rpc/netlogon.o \
+               rpc/samlogon.o \
+               rpc/samsync.o \
+               rpc/rot.o \
+               rpc/bind.o \
+               rpc/dssetup.o \
+               rpc/alter_context.o \
+               rpc/bench.o
 REQUIRED_SUBSYSTEMS = \
                NDR_ALL RPC_NDR_UNIXINFO RPC_NDR_SAMR RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN \
                RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL \
@@ -122,7 +122,7 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM TORTURE_RAP
 [SUBSYSTEM::TORTURE_RAP]
 ADD_OBJ_FILES = \
-               torture/rap/rap.o
+               rap/rap.o
 REQUIRED_SUBSYSTEMS = \
                LIBSMB
 # End SUBSYSTEM TORTURE_RAP
@@ -132,8 +132,8 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM TORTURE_AUTH
 [SUBSYSTEM::TORTURE_AUTH]
 ADD_OBJ_FILES = \
-               torture/auth/ntlmssp.o \
-               torture/auth/pac.o
+               auth/ntlmssp.o \
+               auth/pac.o
 REQUIRED_SUBSYSTEMS = \
                LIBSMB GENSEC AUTH
 # End SUBSYSTEM TORTURE_AUTH
@@ -143,17 +143,17 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM TORTURE_LOCAL
 [SUBSYSTEM::TORTURE_LOCAL]
 ADD_OBJ_FILES = \
-               torture/local/iconv.o \
-               lib/talloc/testsuite.o \
-               torture/local/messaging.o \
-               torture/local/binding_string.o \
-               torture/local/idtree.o \
-               torture/local/socket.o \
-               torture/local/irpc.o \
-               torture/local/registry.o \
-               torture/local/resolve.o \
-               torture/local/util_strlist.o \
-               torture/local/util_file.o
+               local/iconv.o \
+               ../lib/talloc/testsuite.o \
+               local/messaging.o \
+               local/binding_string.o \
+               local/idtree.o \
+               local/socket.o \
+               local/irpc.o \
+               local/registry.o \
+               local/resolve.o \
+               local/util_strlist.o \
+               local/util_file.o
 REQUIRED_SUBSYSTEMS = \
                LIBSMB \
                MESSAGING \
@@ -165,8 +165,8 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM TORTURE_NBENCH
 [SUBSYSTEM::TORTURE_NBENCH]
 ADD_OBJ_FILES = \
-               torture/nbench/nbio.o \
-               torture/nbench/nbench.o
+               nbench/nbio.o \
+               nbench/nbench.o
 # End SUBSYSTEM TORTURE_NBENCH
 #################################
 
@@ -174,10 +174,10 @@ ADD_OBJ_FILES = \
 # Start SUBSYSTEM TORTURE_LDAP
 [SUBSYSTEM::TORTURE_LDAP]
 ADD_OBJ_FILES = \
-               torture/ldap/common.o \
-               torture/ldap/basic.o \
-               torture/ldap/cldap.o \
-               torture/ldap/cldapbench.o
+               ldap/common.o \
+               ldap/basic.o \
+               ldap/cldap.o \
+               ldap/cldapbench.o
 REQUIRED_SUBSYSTEMS = \
                LIBCLI_LDAP LIBCLI_CLDAP
 # End SUBSYSTEM TORTURE_LDAP
@@ -187,12 +187,12 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM TORTURE_NBT
 [SUBSYSTEM::TORTURE_NBT]
 ADD_OBJ_FILES = \
-               torture/nbt/query.o \
-               torture/nbt/register.o \
-               torture/nbt/wins.o \
-               torture/nbt/winsbench.o \
-               torture/nbt/winsreplication.o \
-               torture/nbt/dgram.o
+               nbt/query.o \
+               nbt/register.o \
+               nbt/wins.o \
+               nbt/winsbench.o \
+               nbt/winsreplication.o \
+               nbt/dgram.o
 REQUIRED_SUBSYSTEMS = \
                LIBSMB LIBCLI_NBT LIBCLI_WREPL
 # End SUBSYSTEM TORTURE_NBT
@@ -202,13 +202,13 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM TORTURE_NET
 [SUBSYSTEM::TORTURE_NET]
 ADD_OBJ_FILES = \
-               torture/libnet/userinfo.o \
-               torture/libnet/userman.o \
-               torture/libnet/domain.o \
-               torture/libnet/libnet_lookup.o \
-               torture/libnet/libnet_user.o \
-               torture/libnet/libnet_share.o \
-               torture/libnet/libnet_rpc.o
+               libnet/userinfo.o \
+               libnet/userman.o \
+               libnet/domain.o \
+               libnet/libnet_lookup.o \
+               libnet/libnet_user.o \
+               libnet/libnet_share.o \
+               libnet/libnet_rpc.o
 REQUIRED_SUBSYSTEMS = \
                NDR_ALL RPC_NDR_SAMR LIBNET
 # End SUBSYSTEM TORTURE_NET
@@ -219,8 +219,8 @@ REQUIRED_SUBSYSTEMS = \
 [BINARY::smbtorture]
 INSTALLDIR = BINDIR
 OBJ_FILES = \
-               torture/torture.o \
-               torture/torture_util.o
+               torture.o \
+               torture_util.o
 REQUIRED_SUBSYSTEMS = \
                TORTURE_BASIC \
                TORTURE_RAW \
@@ -236,7 +236,7 @@ REQUIRED_SUBSYSTEMS = \
                CONFIG \
                LIBCMDLINE \
                LIBBASIC
-MANPAGE = torture/man/smbtorture.1
+MANPAGE = man/smbtorture.1
 # End BINARY smbtorture
 #################################
 
@@ -245,15 +245,15 @@ MANPAGE = torture/man/smbtorture.1
 [BINARY::gentest]
 INSTALLDIR = BINDIR
 OBJ_FILES = \
-               torture/gentest.o \
-               torture/torture_util.o
+               gentest.o \
+               torture_util.o
 REQUIRED_SUBSYSTEMS = \
                LIBSMB \
                CONFIG \
                LIBBASIC \
                LIBCMDLINE \
                RPC
-MANPAGE = torture/man/gentest.1
+MANPAGE = man/gentest.1
 # End BINARY gentest
 #################################
 
@@ -262,14 +262,14 @@ MANPAGE = torture/man/gentest.1
 [BINARY::masktest]
 INSTALLDIR = BINDIR
 OBJ_FILES = \
-               torture/masktest.o
+               masktest.o
 REQUIRED_SUBSYSTEMS = \
                LIBSMB \
                CONFIG \
                LIBBASIC \
                LIBCMDLINE \
                RPC
-MANPAGE = torture/man/masktest.1
+MANPAGE = man/masktest.1
 # End BINARY masktest
 #################################
 
@@ -278,15 +278,15 @@ MANPAGE = torture/man/masktest.1
 [BINARY::locktest]
 INSTALLDIR = BINDIR
 OBJ_FILES = \
-               torture/locktest.o \
-               torture/torture_util.o
+               locktest.o \
+               torture_util.o
 REQUIRED_SUBSYSTEMS = \
                LIBSMB \
                CONFIG \
                LIBBASIC \
                LIBCMDLINE \
                RPC
-MANPAGE = torture/man/locktest.1
+MANPAGE = man/locktest.1
 # End BINARY locktest
 #################################
 
index f526d89a9eec93636931f2d7c70488840604a63e..11d193e0272703f709e381d18998ed2dc54ddc8b 100644 (file)
@@ -5,14 +5,14 @@
 [BINARY::ndrdump]
 INSTALLDIR = BINDIR
 OBJ_FILES = \
-               utils/ndrdump.o
+               ndrdump.o
 REQUIRED_SUBSYSTEMS = \
                CONFIG \
                LIBCMDLINE \
                LIBBASIC \
                NDR_ALL \
                RPC
-MANPAGE = utils/man/ndrdump.1
+MANPAGE = man/ndrdump.1
 # FIXME: ndrdump shouldn't have to depend on RPC...
 # End BINARY ndrdump
 #################################
@@ -22,14 +22,14 @@ MANPAGE = utils/man/ndrdump.1
 [BINARY::ntlm_auth]
 INSTALLDIR = BINDIR
 OBJ_FILES = \
-               utils/ntlm_auth.o
+               ntlm_auth.o
 REQUIRED_SUBSYSTEMS = \
                CONFIG \
                LIBCMDLINE \
                LIBBASIC \
                LIBSMB \
                RPC
-MANPAGE = utils/man/ntlm_auth.1
+MANPAGE = man/ntlm_auth.1
 # End BINARY ntlm_auth
 #################################
 
@@ -38,7 +38,7 @@ MANPAGE = utils/man/ntlm_auth.1
 [BINARY::getntacl]
 INSTALLDIR = BINDIR
 OBJ_FILES = \
-               utils/getntacl.o
+               getntacl.o
 REQUIRED_SUBSYSTEMS = \
                CONFIG \
                LIBCMDLINE \
@@ -54,7 +54,7 @@ REQUIRED_SUBSYSTEMS = \
 [BINARY::setntacl]
 INSTALLDIR = BINDIR
 OBJ_FILES = \
-               utils/setntacl.o
+               setntacl.o
 REQUIRED_SUBSYSTEMS = \
                CONFIG \
                LIBCMDLINE \
@@ -68,7 +68,7 @@ REQUIRED_SUBSYSTEMS = \
 [BINARY::setnttoken]
 INSTALLDIR = BINDIR
 OBJ_FILES = \
-               utils/setnttoken.o
+               setnttoken.o
 REQUIRED_SUBSYSTEMS = \
                CONFIG \
                LIBCMDLINE \
@@ -84,7 +84,7 @@ REQUIRED_SUBSYSTEMS = \
 [BINARY::nmblookup]
 INSTALLDIR = BINDIR
 OBJ_FILES = \
-               utils/nmblookup.o
+               nmblookup.o
 REQUIRED_SUBSYSTEMS = \
                CONFIG \
                LIBCMDLINE \
index 2f455d381f101cc5f9c4844e16c4a4b507f14677..382906f349bf6206140fa1229fd37ed06c33a4e4 100644 (file)
@@ -5,12 +5,12 @@
 [BINARY::net]
 INSTALLDIR = BINDIR
 OBJ_FILES = \
-               utils/net/net.o \
-               utils/net/net_password.o \
-               utils/net/net_time.o \
-               utils/net/net_join.o \
-               utils/net/net_vampire.o \
-               utils/net/net_user.o
+               net.o \
+               net_password.o \
+               net_time.o \
+               net_join.o \
+               net_vampire.o \
+               net_user.o
 REQUIRED_SUBSYSTEMS = \
                CONFIG \
                LIBCMDLINE \
index 7748ed7e4742919bba27b77ae613c22f2a31bec5..214ed91778a0702f99d91e97a5d502a14a707f63 100644 (file)
@@ -4,9 +4,9 @@
 # Start SUBSYSTEM WEB
 [SUBSYSTEM::WEB]
 INIT_OBJ_FILES = \
-               web_server/web_server.o
+               web_server.o
 ADD_OBJ_FILES = \
-               web_server/http.o
+               http.o
 REQUIRED_SUBSYSTEMS = ESP LIBTLS SMBCALLS
 # End SUBSYSTEM WEB
 #######################
index 6d63acb1155a4a9a8ee9a70e436c7b95e9246ba5..597c96549d97e679bc25512546e230c61899517f 100644 (file)
@@ -6,22 +6,22 @@
 INIT_FUNCTION = server_service_winbind_init
 SUBSYSTEM = SERVER_SERVICE
 INIT_OBJ_FILES = \
-               winbind/wb_server.o \
-               winbind/wb_samba3_protocol.o \
-               winbind/wb_samba3_cmd.o \
-               winbind/wb_init_domain.o \
-               winbind/wb_sid2domain.o \
-               winbind/wb_domain_request.o \
-               winbind/wb_connect_lsa.o \
-               winbind/wb_connect_sam.o \
-               winbind/wb_cmd_lookupname.o \
-               winbind/wb_cmd_lookupsid.o \
-               winbind/wb_cmd_getdcname.o \
-               winbind/wb_cmd_userdomgroups.o \
-               winbind/wb_cmd_usersids.o \
-               winbind/wb_cmd_list_trustdom.o \
-               winbind/wb_pam_auth.o \
-               winbind/wb_async_helpers.o
+               wb_server.o \
+               wb_samba3_protocol.o \
+               wb_samba3_cmd.o \
+               wb_init_domain.o \
+               wb_sid2domain.o \
+               wb_domain_request.o \
+               wb_connect_lsa.o \
+               wb_connect_sam.o \
+               wb_cmd_lookupname.o \
+               wb_cmd_lookupsid.o \
+               wb_cmd_getdcname.o \
+               wb_cmd_userdomgroups.o \
+               wb_cmd_usersids.o \
+               wb_cmd_list_trustdom.o \
+               wb_pam_auth.o \
+               wb_async_helpers.o
 REQUIRED_SUBSYSTEMS = RPC_NDR_LSA
 # End MODULE server_service_winbind
 ################################################
index 8c1202ae94a27d29998bcf60bf19dd22a26124c5..cc4621ba4509201b63fe19007f9b77f8c03aa1dc 100644 (file)
@@ -4,12 +4,12 @@
 # Start SUBSYSTEM WREPL_SRV
 [SUBSYSTEM::WREPL_SRV]
 INIT_OBJ_FILES = \
-               wrepl_server/wrepl_server.o \
-               wrepl_server/wrepl_in_connection.o \
-               wrepl_server/wrepl_in_call.o \
-               wrepl_server/wrepl_out_connection.o \
-               wrepl_server/wrepl_out_helpers.o \
-               wrepl_server/wrepl_apply_records.o
+               wrepl_server.o \
+               wrepl_in_connection.o \
+               wrepl_in_call.o \
+               wrepl_out_connection.o \
+               wrepl_out_helpers.o \
+               wrepl_apply_records.o
 REQUIRED_SUBSYSTEMS = \
                LIBCLI_WREPL WINSDB
 # End SUBSYSTEM WREPL_SRV