diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-05-13 10:20:53 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:53:36 -0500 |
| commit | f236700ef67d4f93ec56ec7808584552e94e0dfe (patch) | |
| tree | 3572ba5a82860e9dc60661161997b77704867cdc /source4/lib/ldb/config.m4 | |
| parent | b2d1f7890765fca5a119d43f4906e885c245005f (diff) | |
| download | samba-f236700ef67d4f93ec56ec7808584552e94e0dfe.tar.gz samba-f236700ef67d4f93ec56ec7808584552e94e0dfe.tar.bz2 samba-f236700ef67d4f93ec56ec7808584552e94e0dfe.zip | |
r665: merge over the new build system from my tmp branch
to the main SAMBA_4_0 tree.
NOTE: that it's not completely ready, but it's functional:-)
metze
(This used to be commit c78a2ddb28ec50d6570a83b1f66f18a5c3621731)
Diffstat (limited to 'source4/lib/ldb/config.m4')
| -rw-r--r-- | source4/lib/ldb/config.m4 | 58 |
1 files changed, 16 insertions, 42 deletions
diff --git a/source4/lib/ldb/config.m4 b/source4/lib/ldb/config.m4 index f450acce00..16805132fd 100644 --- a/source4/lib/ldb/config.m4 +++ b/source4/lib/ldb/config.m4 @@ -1,45 +1,19 @@ if test x"$with_ldap_support" = x"yes"; then -SMB_SUBSYSTEM(LIBLDB_LDAP,[lib/ldb/ldb_ldap/ldb_ldap.o]) + SMB_MODULE_DEFAULT(libldb_ldap,STATIC) fi -SMB_SUBSYSTEM(LIBLDB,[lib/ldb/common/ldb.o], - [lib/ldb/common/ldb_ldif.o \ - lib/ldb/common/ldb_parse.o \ - lib/ldb/common/ldb_msg.o \ - lib/ldb/common/util.o \ - lib/ldb/common/ldb_utf8.o \ - lib/ldb/common/ldb_alloc.o \ - lib/ldb/common/ldb_debug.o \ - lib/ldb/ldb_tdb/ldb_search.o \ - lib/ldb/ldb_tdb/ldb_tdb.o \ - lib/ldb/ldb_tdb/ldb_pack.o \ - lib/ldb/ldb_tdb/ldb_index.o \ - lib/ldb/ldb_tdb/ldb_match.o \ - lib/ldb/ldb_tdb/ldb_cache.o \ - \$(LIBLDB_LDAP_OBJS)], - lib/ldb/include/ldb.h) - -SMB_SUBSYSTEM(LDBADD,[], - [lib/ldb/tools/ldbadd.o \ - \$(LIBBASIC_OBJS) \$(LIBSMB_OBJS) \$(CONFIG_OBJS) \$(LIBLDB_OBJS)], - lib/ldb/include/proto.h) - -SMB_SUBSYSTEM(LDBDEL,[], - [lib/ldb/tools/ldbdel.o \ - \$(LIBBASIC_OBJS) \$(LIBSMB_OBJS) \$(CONFIG_OBJS) \$(LIBLDB_OBJS)], - lib/ldb/include/proto.h) - -SMB_SUBSYSTEM(LDBMODIFY,[], - [lib/ldb/tools/ldbmodify.o \ - \$(LIBBASIC_OBJS) \$(LIBSMB_OBJS) \$(CONFIG_OBJS) \$(LIBLDB_OBJS)], - lib/ldb/include/proto.h) - -SMB_SUBSYSTEM(LDBSEARCH,[], - [lib/ldb/tools/ldbsearch.o \ - \$(LIBBASIC_OBJS) \$(LIBSMB_OBJS) \$(CONFIG_OBJS) \$(LIBLDB_OBJS)], - lib/ldb/include/proto.h) - -SMB_SUBSYSTEM(LDBEDIT,[], - [lib/ldb/tools/ldbedit.o \ - \$(LIBBASIC_OBJS) \$(LIBSMB_OBJS) \$(CONFIG_OBJS) \$(LIBLDB_OBJS)], - lib/ldb/include/proto.h) +SMB_MODULE_MK(libldb_ldap,LIBLDB,NOT,lib/ldb/config.mk) + +SMB_MODULE_MK(libldb_tdb,LIBLDB,STATIC,lib/ldb/config.mk) + +SMB_SUBSYSTEM_MK(LIBLDB,lib/ldb/config.mk) + +SMB_BINARY_MK(ldbadd,lib/ldb/config.mk) + +SMB_BINARY_MK(ldbdel,lib/ldb/config.mk) + +SMB_BINARY_MK(ldbmodify,lib/ldb/config.mk) + +SMB_BINARY_MK(ldbsearch,lib/ldb/config.mk) + +SMB_BINARY_MK(ldbedit,lib/ldb/config.mk) |