2 files changed, 29 insertions, 29 deletions
diff --git a/source4/lib/tdb/Makefile.tdb b/source4/lib/tdb/Makefile.tdb
new file mode 100644
index 0000000000..db697e9379
--- /dev/null
+++ b/source4/lib/tdb/Makefile.tdb
@@ -0,0 +1,29 @@
+#
+# Makefile for tdb directory
+#
+
+CFLAGS = -DSTANDALONE -DTDB_DEBUG -g -DHAVE_MMAP=1 -Iinclude
+CC = gcc
+
+PROGS = bin/tdbtest bin/tdbtool bin/tdbtorture
+TDB_OBJ = common/tdb.o common/spinlock.o
+
+default: $(PROGS)
+
+bin/tdbtest: tools/tdbtest.o $(TDB_OBJ)
+	$(CC) $(CFLAGS) -o tdbtest tools/tdbtest.o $(TDB_OBJ) -lgdbm
+
+bin/tdbtool: tools/tdbtool.o $(TDB_OBJ)
+	$(CC) $(CFLAGS) -o tdbtool tools/tdbtool.o $(TDB_OBJ)
+
+bin/tdbtorture: tools/tdbtorture.o $(TDB_OBJ)
+	$(CC) $(CFLAGS) -o tdbtorture tools/tdbtorture.o $(TDB_OBJ)
+
+bin/tdbdump: tools/tdbdump.o $(TDB_OBJ)
+	$(CC) $(CFLAGS) -o tdbdump tools/tdbdump.o $(TDB_OBJ)
+
+bin/tdbbackup: tools/tdbbackup.o $(TDB_OBJ)
+	$(CC) $(CFLAGS) -o tdbbackup tools/tdbbackup.o $(TDB_OBJ)
+
+clean:
+	rm -f $(PROGS) common/*.o *~ *.bak */*~ */*.bak *% core test.db test.tdb test.gdbm
diff --git a/source4/lib/tdb/tools/Makefile b/source4/lib/tdb/tools/Makefile
deleted file mode 100644
index 59fbb079bd..0000000000
--- a/source4/lib/tdb/tools/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Makefile for tdb directory
-#
-
-CFLAGS = -DSTANDALONE -DTDB_DEBUG -g -DHAVE_MMAP=1
-CC = gcc
-
-PROGS = tdbtest tdbtool tdbtorture
-TDB_OBJ = tdb.o spinlock.o
-
-default: $(PROGS)
-
-tdbtest: tdbtest.o $(TDB_OBJ)
-	$(CC) $(CFLAGS) -o tdbtest tdbtest.o $(TDB_OBJ) -lgdbm
-
-tdbtool: tdbtool.o $(TDB_OBJ)
-	$(CC) $(CFLAGS) -o tdbtool tdbtool.o $(TDB_OBJ)
-
-tdbtorture: tdbtorture.o $(TDB_OBJ)
-	$(CC) $(CFLAGS) -o tdbtorture tdbtorture.o $(TDB_OBJ)
-
-tdbdump: tdbdump.o $(TDB_OBJ)
-	$(CC) $(CFLAGS) -o tdbdump tdbdump.o $(TDB_OBJ)
-
-tdbbackup: tdbbackup.o $(TDB_OBJ)
-	$(CC) $(CFLAGS) -o tdbbackup tdbbackup.o $(TDB_OBJ)
-
-clean:
-	rm -f $(PROGS) *.o *~ *% core test.db test.tdb test.gdbm