summaryrefslogtreecommitdiff
path: root/source4/lib/ldb
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-04-14 17:22:58 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-04-14 17:22:58 +0200
commite9017ba418202b4b191c5a9ad4a96857558ce606 (patch)
tree7a5069a59fde6de060a8946fa1b04a22333b3078 /source4/lib/ldb
parentffc5cbfe803326a1c3bf55684717af910d091c5a (diff)
downloadsamba-e9017ba418202b4b191c5a9ad4a96857558ce606.tar.gz
samba-e9017ba418202b4b191c5a9ad4a96857558ce606.tar.bz2
samba-e9017ba418202b4b191c5a9ad4a96857558ce606.zip
Use _OBJ_FILES variables in a couple more places.
(This used to be commit 92856d5054106894b65cd1a1b5119c0facfc4cff)
Diffstat (limited to 'source4/lib/ldb')
-rw-r--r--source4/lib/ldb/config.mk78
1 files changed, 30 insertions, 48 deletions
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index 81fd1e9b95..f526a8ce1f 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -5,8 +5,8 @@ PRIVATE_DEPENDENCIES = LIBTALLOC
CFLAGS = -Ilib/ldb/include
INIT_FUNCTION = &ldb_asq_module_ops
SUBSYSTEM = LIBLDB
-OBJ_FILES = \
- modules/asq.o
+
+ldb_asq_OBJ_FILES = lib/ldb/modules/asq.o
# End MODULE ldb_asq
################################################
@@ -17,10 +17,10 @@ PRIVATE_DEPENDENCIES = LIBTALLOC
CFLAGS = -Ilib/ldb/include
INIT_FUNCTION = &ldb_server_sort_module_ops
SUBSYSTEM = LIBLDB
-OBJ_FILES = \
- modules/sort.o
+
# End MODULE ldb_sort
################################################
+ldb_server_sort_OBJ_FILES = lib/ldb/modules/sort.o
################################################
# Start MODULE ldb_paged_results
@@ -29,11 +29,11 @@ INIT_FUNCTION = &ldb_paged_results_module_ops
CFLAGS = -Ilib/ldb/include
PRIVATE_DEPENDENCIES = LIBTALLOC
SUBSYSTEM = LIBLDB
-OBJ_FILES = \
- modules/paged_results.o
# End MODULE ldb_paged_results
################################################
+ldb_paged_results_OBJ_FILES = lib/ldb/modules/paged_results.o
+
################################################
# Start MODULE ldb_paged_results
[MODULE::ldb_paged_searches]
@@ -41,11 +41,11 @@ INIT_FUNCTION = &ldb_paged_searches_module_ops
CFLAGS = -Ilib/ldb/include
PRIVATE_DEPENDENCIES = LIBTALLOC
SUBSYSTEM = LIBLDB
-OBJ_FILES = \
- modules/paged_searches.o
# End MODULE ldb_paged_results
################################################
+ldb_paged_searches_OBJ_FILES = lib/ldb/modules/paged_searches.o
+
################################################
# Start MODULE ldb_operational
[MODULE::ldb_operational]
@@ -53,11 +53,11 @@ SUBSYSTEM = LIBLDB
CFLAGS = -Ilib/ldb/include
PRIVATE_DEPENDENCIES = LIBTALLOC
INIT_FUNCTION = &ldb_operational_module_ops
-OBJ_FILES = \
- modules/operational.o
# End MODULE ldb_operational
################################################
+ldb_operational_OBJ_FILES = lib/ldb/modules/operational.o
+
################################################
# Start MODULE ldb_rdn_name
[MODULE::ldb_rdn_name]
@@ -65,23 +65,21 @@ SUBSYSTEM = LIBLDB
CFLAGS = -Ilib/ldb/include
PRIVATE_DEPENDENCIES = LIBTALLOC
INIT_FUNCTION = &ldb_rdn_name_module_ops
-OBJ_FILES = \
- modules/rdn_name.o
# End MODULE ldb_rdn_name
################################################
+ldb_rdn_name_OBJ_FILES = lib/ldb/modules/rdn_name.o
+
################################################
# Start MODULE ldb_map
[SUBSYSTEM::ldb_map]
PRIVATE_DEPENDENCIES = LIBTALLOC
CFLAGS = -Ilib/ldb/include -Ilib/ldb/ldb_map
-OBJ_FILES = \
- ldb_map/ldb_map_inbound.o \
- ldb_map/ldb_map_outbound.o \
- ldb_map/ldb_map.o
# End MODULE ldb_map
################################################
+ldb_map_OBJ_FILES = $(addprefix lib/ldb/ldb_map/, ldb_map_inbound.o ldb_map_outbound.o ldb_map.o)
+
################################################
# Start MODULE ldb_skel
[MODULE::ldb_skel]
@@ -89,38 +87,35 @@ SUBSYSTEM = LIBLDB
CFLAGS = -Ilib/ldb/include
PRIVATE_DEPENDENCIES = LIBTALLOC
INIT_FUNCTION = &ldb_skel_module_ops
-OBJ_FILES = modules/skel.o
# End MODULE ldb_skel
################################################
+ldb_skel_OBJ_FILES = lib/ldb/modules/skel.o
+
################################################
# Start MODULE ldb_sqlite3
[MODULE::ldb_sqlite3]
SUBSYSTEM = LIBLDB
CFLAGS = -Ilib/ldb/include
PRIVATE_DEPENDENCIES = LIBTALLOC SQLITE3 LIBTALLOC
-OBJ_FILES = \
- ldb_sqlite3/ldb_sqlite3.o
# End MODULE ldb_sqlite3
################################################
+ldb_sqlite3_OBJ_FILES = lib/ldb/ldb_sqlite3/ldb_sqlite3.o
+
################################################
# Start MODULE ldb_tdb
[MODULE::ldb_tdb]
SUBSYSTEM = LIBLDB
CFLAGS = -Ilib/ldb/include -Ilib/ldb/ldb_tdb
-OBJ_FILES = \
- ldb_tdb/ldb_tdb.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
PRIVATE_DEPENDENCIES = \
LIBTDB LIBTALLOC
# End MODULE ldb_tdb
################################################
+ldb_tdb_OBJ_FILES = $(addprefix lib/ldb/ldb_tdb/, ldb_tdb.o ldb_search.o ldb_pack.o ldb_index.o ldb_cache.o ldb_tdb_wrap.o)
+
+
################################################
# Start SUBSYSTEM ldb
[LIBRARY::LIBLDB]
@@ -129,20 +124,6 @@ SO_VERSION = 0
CFLAGS = -Ilib/ldb/include
PC_FILE = ldb.pc
INIT_FUNCTION_TYPE = extern const struct ldb_module_ops
-OBJ_FILES = \
- common/ldb.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 \
- common/ldb_controls.o \
- common/qsort.o
PUBLIC_DEPENDENCIES = \
LIBTALLOC
PRIVATE_DEPENDENCIES = \
@@ -151,6 +132,8 @@ PRIVATE_DEPENDENCIES = \
# End SUBSYSTEM ldb
################################################
+LIBLDB_OBJ_FILES = $(addprefix lib/ldb/common/, ldb.o ldb_ldif.o ldb_parse.o ldb_msg.o ldb_utf8.o ldb_debug.o ldb_modules.o ldb_match.o ldb_attributes.o attrib_handlers.o ldb_dn.o ldb_controls.o qsort.o)
+
PUBLIC_HEADERS += $(ldbdir)/include/ldb.h $(ldbdir)/include/ldb_errors.h
MANPAGES += $(ldbdir)/man/ldb.3
@@ -158,39 +141,38 @@ MANPAGES += $(ldbdir)/man/ldb.3
################################################
# Start BINARY ldbtest
[BINARY::ldbtest]
-OBJ_FILES= \
- tools/ldbtest.o
PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE
# End BINARY ldbtest
################################################
+ldbtest_OBJ_FILES = lib/ldb/tools/ldbtest.o
+
################################################
# Start BINARY oLschema2ldif
[BINARY::oLschema2ldif]
INSTALLDIR = BINDIR
-OBJ_FILES= \
- tools/convert.o \
- tools/oLschema2ldif.o
PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE
# End BINARY oLschema2ldif
################################################
+
+oLschema2ldif_OBJ_FILES = $(addprefix lib/ldb/tools/, convert.o oLschema2ldif.o)
+
MANPAGES += $(ldbdir)/man/oLschema2ldif.1
################################################
# Start BINARY ad2oLschema
[BINARY::ad2oLschema]
INSTALLDIR = BINDIR
-OBJ_FILES= \
- tools/convert.o \
- tools/ad2oLschema.o
PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE
# End BINARY ad2oLschema
################################################
+ad2oLschema_OBJ_FILES = $(addprefix lib/ldb/tools/, convert.o ad2oLschema.o)
+
MANPAGES += $(ldbdir)/man/ad2oLschema.1
mkinclude tools/config.mk