From 8a01231a8bb03884c17c174f7d2cfea536da1130 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Mon, 7 Jun 2004 01:59:23 +0000 Subject: r1055: Standalone build fixes for ldb: - Various Makefile fixes - #include ldb still needs a proper build system though. (-: (This used to be commit 52e4fe8ce9142c4002263686c8043d94b37d7a9c) --- source4/lib/ldb/Makefile.ldb | 6 +++--- 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 +#include #include #include #include @@ -18,5 +19,5 @@ #include #include #include "ldb.h" -#include "tdb/tdb.h" +#include "tdb.h" #include "proto.h" -- cgit