diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 22:25:19 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 22:25:19 +0100 |
| commit | b4017955e19723e48b41b70c7ba313dcfcda5eb9 (patch) | |
| tree | 138d37f4c9abc2dcecd38a6ba4e5c539b4927421 /source4/main.mk | |
| parent | 1131d4c2545355ef793e468810655c0f72828368 (diff) | |
| parent | b136033421eb045b28f5928e4d2f9604cf704690 (diff) | |
| download | samba-b4017955e19723e48b41b70c7ba313dcfcda5eb9.tar.gz samba-b4017955e19723e48b41b70c7ba313dcfcda5eb9.tar.bz2 samba-b4017955e19723e48b41b70c7ba313dcfcda5eb9.zip | |
Merge branch 'v4-0-trivial' into v4-0-gmake3
Conflicts:
source/build/smb_build/input.pm
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
(This used to be commit bc11e3ef1c34923f5b13571926617a840ad554fe)
Diffstat (limited to 'source4/main.mk')
| -rw-r--r-- | source4/main.mk | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/source4/main.mk b/source4/main.mk index beba4d2039..b8364aca5a 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -1,31 +1,31 @@ -include dynconfig.mk -include heimdal_build/config.mk -include config.mk -include dsdb/config.mk -include smbd/config.mk -include cluster/config.mk -include smbd/process_model.mk -include libnet/config.mk -include auth/config.mk -include nsswitch/config.mk -include lib/basic.mk -include param/config.mk -include smb_server/config.mk -include rpc_server/config.mk -include ldap_server/config.mk -include web_server/config.mk -include winbind/config.mk -include nbt_server/config.mk -include wrepl_server/config.mk -include cldap_server/config.mk -include utils/net/config.mk -include utils/config.mk -include ntvfs/config.mk -include ntptr/config.mk -include torture/config.mk -include librpc/config.mk -include client/config.mk -include libcli/config.mk -include scripting/ejs/config.mk -include scripting/python/config.mk -include kdc/config.mk +mkinclude dynconfig.mk +mkinclude heimdal_build/config.mk +mkinclude config.mk +mkinclude dsdb/config.mk +mkinclude smbd/config.mk +mkinclude cluster/config.mk +mkinclude smbd/process_model.mk +mkinclude libnet/config.mk +mkinclude auth/config.mk +mkinclude nsswitch/config.mk +mkinclude lib/basic.mk +mkinclude param/config.mk +mkinclude smb_server/config.mk +mkinclude rpc_server/config.mk +mkinclude ldap_server/config.mk +mkinclude web_server/config.mk +mkinclude winbind/config.mk +mkinclude nbt_server/config.mk +mkinclude wrepl_server/config.mk +mkinclude cldap_server/config.mk +mkinclude utils/net/config.mk +mkinclude utils/config.mk +mkinclude ntvfs/config.mk +mkinclude ntptr/config.mk +mkinclude torture/config.mk +mkinclude librpc/config.mk +mkinclude client/config.mk +mkinclude libcli/config.mk +mkinclude scripting/ejs/config.mk +mkinclude scripting/python/config.mk +mkinclude kdc/config.mk |