diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-08-23 04:53:47 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:16:34 -0500 |
| commit | 309ef9069096ce09483e2f9a18f191fc53e1c7f4 (patch) | |
| tree | dd85a81f6bd59c634a0620a4ad2929ad41999cc0 /source4/lib/ldb/Makefile.in | |
| parent | 36cb569e9be142f0b4a4e584a365b35e8bfa454d (diff) | |
| download | samba-309ef9069096ce09483e2f9a18f191fc53e1c7f4.tar.gz samba-309ef9069096ce09483e2f9a18f191fc53e1c7f4.tar.bz2 samba-309ef9069096ce09483e2f9a18f191fc53e1c7f4.zip | |
r17738: solving the seemingly trivial problem of timegm() being missing on
some systems requires quite a large change in ldb. The core problem is
that ldb doesn't have its own equivalent of lib/replace/, so we have
no sane place to put things like timegm.c
This patch moves part of lib/replace/ from Samba4 into ldb, and the
next patch will remove those parts from Samba4. We will probably need
to similarly move parts of lib/replace/ into lib/talloc/ and lib/tdb/,
so that at each level the libraries have replacements for the
functions they need, but higher level libraries don't need to
re-include replacements if a lower level library already replaces the
function
(This used to be commit c2f6c217fb4a5c84499246480f00df40b0711074)
Diffstat (limited to 'source4/lib/ldb/Makefile.in')
| -rw-r--r-- | source4/lib/ldb/Makefile.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in index 9de1131f2b..51227a29ed 100644 --- a/source4/lib/ldb/Makefile.in +++ b/source4/lib/ldb/Makefile.in @@ -12,7 +12,6 @@ VPATH = @srcdir@:@srcdir@/..:@POPTDIR@ srcdir = @srcdir@ builddir = @builddir@ SLAPD = @SLAPD@ -POPTOBJ = @POPTOBJ@ EXTRA_OBJ=@EXTRA_OBJ@ TESTS=test-tdb.sh @TESTS@ @@ -22,6 +21,9 @@ CFLAGS=-I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \ LIB_FLAGS=-Llib -lldb @LIBS@ +REPDIR=replace +REPLACE_OBJ=$(REPDIR)/replace.o $(REPDIR)/timegm.o + TDBDIR=tdb TDB_OBJ=$(TDBDIR)/common/tdb.o $(TDBDIR)/common/dump.o \ $(TDBDIR)/common/io.o $(TDBDIR)/common/lock.o \ @@ -49,7 +51,7 @@ MODULES_OBJ=$(MODDIR)/operational.o $(MODDIR)/schema.o $(MODDIR)/rdn_name.o \ $(MODDIR)/objectclass.o \ $(MODDIR)/paged_results.o $(MODDIR)/sort.o $(MODDIR)/asq.o -OBJS = $(MODULES_OBJ) $(COMMON_OBJ) $(LDB_TDB_OBJ) $(TDB_OBJ) $(TALLOC_OBJ) $(EXTRA_OBJ) $(POPTOBJ) +OBJS = $(MODULES_OBJ) $(COMMON_OBJ) $(LDB_TDB_OBJ) $(TDB_OBJ) $(TALLOC_OBJ) $(EXTRA_OBJ) $(REPLACE_OBJ) LDB_LIB = lib/libldb.a @@ -59,7 +61,7 @@ LIBS = $(LDB_LIB)( $(OBJS) ) EXAMPLES = examples/ldbreader examples/ldifreader -DIRS = lib bin common ldb_tdb ldb_ldap ldb_sqlite3 modules tools examples tdb talloc +DIRS = lib bin common replace ldb_tdb ldb_ldap ldb_sqlite3 modules tools examples tdb talloc all: dirs $(OBJS) $(LIBS) $(BINS) $(EXAMPLES) manpages @@ -106,7 +108,7 @@ examples/ldifreader: examples/ldifreader.o $(LIBS) .SUFFIXES: .1 .1.xml .3 .3.xml .xml .html manpages: - $(srcdir)/docs/builddocs.sh "$(XSLTPROC)" "$(srcdir)" + @$(srcdir)/docs/builddocs.sh "$(XSLTPROC)" "$(srcdir)" doxygen: test -z "$(DOXYGEN)" || (cd $(srcdir) && "$(DOXYGEN)") |