diff options
| author | Tim Potter <tpot@samba.org> | 2004-06-07 01:59:23 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:56:35 -0500 |
| commit | 8a01231a8bb03884c17c174f7d2cfea536da1130 (patch) | |
| tree | f376db3dfadcd82f1ca1f8c7fa75418b27a9678d /source4 | |
| parent | f63cd117ae99fb4f8e65272ada0ded23318f337c (diff) | |
| download | samba-8a01231a8bb03884c17c174f7d2cfea536da1130.tar.gz samba-8a01231a8bb03884c17c174f7d2cfea536da1130.tar.bz2 samba-8a01231a8bb03884c17c174f7d2cfea536da1130.zip | |
r1055: Standalone build fixes for ldb:
- Various Makefile fixes
- #include <stdint.h>
ldb still needs a proper build system though. (-:
(This used to be commit 52e4fe8ce9142c4002263686c8043d94b37d7a9c)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/ldb/Makefile.ldb | 6 | ||||
| -rw-r--r-- | source4/lib/ldb/include/includes.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source4/lib/ldb/Makefile.ldb b/source4/lib/ldb/Makefile.ldb index 392407a46e..5573fba32f 100644 --- a/source4/lib/ldb/Makefile.ldb +++ b/source4/lib/ldb/Makefile.ldb @@ -11,10 +11,10 @@ endif TDBDIR=../tdb -CFLAGS=-Wall -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -g -Iinclude -I. -I.. -DSTANDALONE=1 -DUSE_MMAP=1 $(LDAP_FLAGS) +CFLAGS=-Wall -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -g -Iinclude -I. -I.. -I$(TDBDIR)/include -DSTANDALONE=1 -DUSE_MMAP=1 $(LDAP_FLAGS) LIB_FLAGS=-Llib -lldb $(LDAP_LIBS) -TDB_OBJ=$(TDBDIR)/tdb.o $(TDBDIR)/spinlock.o +TDB_OBJ=$(TDBDIR)/common/tdb.o $(TDBDIR)/common/spinlock.o LDB_TDB_OBJ=ldb_tdb/ldb_match.o ldb_tdb/ldb_tdb.o \ ldb_tdb/ldb_pack.o ldb_tdb/ldb_search.o ldb_tdb/ldb_index.o \ @@ -70,7 +70,7 @@ clean: rm -f */*.o *~ */*~ $(BINS) $(LDB_LIB) man/man?/*.[13] proto: - mkproto.pl */*.c > include/proto.h + perl ../../script/mkproto.pl */*.c > include/proto.h etags: etags */*.[ch] diff --git a/source4/lib/ldb/include/includes.h b/source4/lib/ldb/include/includes.h index bf61a983e0..e55b494b98 100644 --- a/source4/lib/ldb/include/includes.h +++ b/source4/lib/ldb/include/includes.h @@ -6,6 +6,7 @@ #define _GNU_SOURCE #endif #include <stdio.h> +#include <stdint.h> #include <string.h> #include <stdlib.h> #include <errno.h> @@ -18,5 +19,5 @@ #include <sys/time.h> #include <time.h> #include "ldb.h" -#include "tdb/tdb.h" +#include "tdb.h" #include "proto.h" |