diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-11 17:27:25 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:06:27 -0500 |
| commit | 2e5f023a69cda6f507a2a820c97b0f095ce44678 (patch) | |
| tree | 38dd9bb80b39d9f26c4696dc56fee1561cbf6a54 /source4/lib/ldb/config.mk | |
| parent | 08ff1a50f2adf1b68bda79c0ce09316f266d16e6 (diff) | |
| download | samba-2e5f023a69cda6f507a2a820c97b0f095ce44678.tar.gz samba-2e5f023a69cda6f507a2a820c97b0f095ce44678.tar.bz2 samba-2e5f023a69cda6f507a2a820c97b0f095ce44678.zip | |
r25093: Use system-provided ldb library if available. Note that this only means using the ldb library from the system - the custom command-line tools for Samba 4 will still be built even if they are already provided by the system.
(This used to be commit 8aab673df5200a4555777caf4ee58907cf6fe4cc)
Diffstat (limited to 'source4/lib/ldb/config.mk')
| -rw-r--r-- | source4/lib/ldb/config.mk | 99 |
1 files changed, 3 insertions, 96 deletions
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index dcc66d3bb0..473c7edd80 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -71,19 +71,6 @@ OBJ_FILES = \ ################################################ ################################################ -# Start MODULE ldb_ildap -[MODULE::ldb_ildap] -SUBSYSTEM = LIBLDB -CFLAGS = -Ilib/ldb/include -PRIVATE_DEPENDENCIES = LIBTALLOC LIBCLI_LDAP -INIT_FUNCTION = ldb_ildap_init -ALIASES = ldapi ldaps ldap -OBJ_FILES = \ - ldb_ildap/ldb_ildap.o -# End MODULE ldb_ildap -################################################ - -################################################ # Start MODULE ldb_map [MODULE::ldb_map] PRIVATE_DEPENDENCIES = LIBTALLOC @@ -186,89 +173,6 @@ PUBLIC_HEADERS = include/ldb.h include/ldb_errors.h ################################################ ################################################ -# Start SUBSYSTEM LIBLDB_CMDLINE -[SUBSYSTEM::LIBLDB_CMDLINE] -CFLAGS = -Ilib/ldb -OBJ_FILES= \ - tools/cmdline.o -PUBLIC_DEPENDENCIES = LIBLDB LIBPOPT -PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL POPT_SAMBA POPT_CREDENTIALS gensec -# End SUBSYSTEM LIBLDB_CMDLINE -################################################ - -################################################ -# Start BINARY ldbadd -[BINARY::ldbadd] -INSTALLDIR = BINDIR -OBJ_FILES = \ - tools/ldbadd.o -PRIVATE_DEPENDENCIES = \ - LIBLDB_CMDLINE LIBCLI_RESOLVE -MANPAGE = man/ldbadd.1 -# End BINARY ldbadd -################################################ - -################################################ -# Start BINARY ldbdel -[BINARY::ldbdel] -INSTALLDIR = BINDIR -OBJ_FILES= \ - tools/ldbdel.o -PRIVATE_DEPENDENCIES = \ - LIBLDB_CMDLINE -MANPAGE = man/ldbdel.1 -# End BINARY ldbdel -################################################ - -################################################ -# Start BINARY ldbmodify -[BINARY::ldbmodify] -INSTALLDIR = BINDIR -OBJ_FILES= \ - tools/ldbmodify.o -PRIVATE_DEPENDENCIES = \ - LIBLDB_CMDLINE -MANPAGE = man/ldbmodify.1 -# End BINARY ldbmodify -################################################ - -################################################ -# Start BINARY ldbsearch -[BINARY::ldbsearch] -INSTALLDIR = BINDIR -OBJ_FILES= \ - tools/ldbsearch.o -PRIVATE_DEPENDENCIES = \ - LIBLDB_CMDLINE -MANPAGE = man/ldbsearch.1 -# End BINARY ldbsearch -################################################ - -################################################ -# Start BINARY ldbedit -[BINARY::ldbedit] -INSTALLDIR = BINDIR -OBJ_FILES= \ - tools/ldbedit.o -PRIVATE_DEPENDENCIES = \ - LIBLDB_CMDLINE -MANPAGE = man/ldbedit.1 -# End BINARY ldbedit -################################################ - -################################################ -# Start BINARY ldbrename -[BINARY::ldbrename] -INSTALLDIR = BINDIR -OBJ_FILES= \ - tools/ldbrename.o -PRIVATE_DEPENDENCIES = \ - LIBLDB_CMDLINE -MANPAGE = man/ldbrename.1 -# End BINARY ldbrename -################################################ - -################################################ # Start BINARY ldbtest [BINARY::ldbtest] OBJ_FILES= \ @@ -312,3 +216,6 @@ LIBRARY_REALNAME = swig/_ldb.$(SHLIBEXT) OBJ_FILES = swig/ldb_wrap.o # End LIBRARY swig_ldb ####################### + +include tools/config.mk +include ldb_ildap/config.mk |